[Pkg-ganeti-devel] [ganeti] 03/14: Drop 0001-Fix-specification-of-TIDiskParams.patch

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ganeti.

commit 8b2bc554d11484bad7c04e3b624e1260995c155b
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Sat Apr 19 20:31:02 2014 +0300

    Drop 0001-Fix-specification-of-TIDiskParams.patch
    
    It has been merged upstream.
---
 .../0001-Fix-specification-of-TIDiskParams.patch   | 32 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 33 deletions(-)

diff --git a/debian/patches/0001-Fix-specification-of-TIDiskParams.patch b/debian/patches/0001-Fix-specification-of-TIDiskParams.patch
deleted file mode 100644
index d6ad753..0000000
--- a/debian/patches/0001-Fix-specification-of-TIDiskParams.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 49ee1838bffb5960e5e9bd59c0187d47203c2b44 Mon Sep 17 00:00:00 2001
-From: Klaus Aehlig <aehlig at google.com>
-Date: Mon, 3 Feb 2014 17:50:11 +0100
-Subject: [PATCH] Fix specification of TIDiskParams
-
-Commit 580b1fdd incorrectly assumes that disk parameters are
-just the standard ones, whereas the man page explicitly states
-that additional parameters can be passed as well, if they make
-sense for the chosen storage type. Fix this.
-
-Signed-off-by: Klaus Aehlig <aehlig at google.com>
-Reviewed-by: Petr Pudlak <pudlak at google.com>
----
- lib/ht.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/ht.py b/lib/ht.py
-index d6171ac..ee82148 100644
---- a/lib/ht.py
-+++ b/lib/ht.py
-@@ -570,7 +570,7 @@ TINicParams = \
-                                       TMaybe(TString)))
- 
- TIDiskParams = \
--    Comment("Disk parameters")(TDictOf(TElemOf(constants.IDISK_PARAMS),
-+    Comment("Disk parameters")(TDictOf(TNonEmptyString,
-                                        TOr(TNonEmptyString, TInt)))
- 
- THypervisor = TElemOf(constants.HYPER_TYPES)
--- 
-1.9.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 7c78fc4..e82830b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ fix-startup-with-old-config.patch
 cfgupgrade12-remove-old-ssconf.patch
 0003-Disable-local-checks-during-build.patch
 pass-ghc-linker-flags.patch
-0001-Fix-specification-of-TIDiskParams.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git