[Pkg-ganeti-devel] [ganeti] 04/10: Drop fix-wconfd-metad 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 5a4e9048090a451b661d43be1740250a462ac654
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Wed Apr 29 13:58:45 2015 +0300

    Drop fix-wconfd-metad patch
    
    Merged upstream.
---
 debian/patches/fix-wconfd-metad | 28 ----------------------------
 debian/patches/series           |  1 -
 2 files changed, 29 deletions(-)

diff --git a/debian/patches/fix-wconfd-metad b/debian/patches/fix-wconfd-metad
deleted file mode 100644
index e22886f..0000000
--- a/debian/patches/fix-wconfd-metad
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 62d0ee90a1a16aa20af2c84cf37a0686c4bfd99d
-Author: Apollon Oikonomopoulos <apoikos at gmail.com>
-Date:   Sat Oct 18 00:42:32 2014 +0300
-
-    Really run wconfd as masterd and metad as root
-    
-    Commits 9decc439eb4 and 4ddce51deb were incomplete, missing the relevant
-    group specifications. Since the decision was made to run wconfd as
-    masterd and metad as root, we use the respective existing groups.
-    
-    Signed-off-by: Apollon Oikonomopoulos <apoikos at gmail.com>
-
---- a/configure
-+++ b/configure
-@@ -3016,11 +3016,11 @@
-   withval=$with_group_prefix; group_rapi="${withval}rapi";
-    group_admin="${withval}admin";
-    group_confd="${withval}confd";
--   group_wconfd="${withval}wconfd";
-+   group_wconfd="${withval}masterd";
-    group_kvmd="$group_default";
-    group_luxid="${withval}luxid";
-    group_masterd="${withval}masterd";
--   group_metad="${withval}metad";
-+   group_metad="$group_default";
-    group_noded="$group_default";
-    group_daemons="${withval}daemons";
-    group_mond="$group_default"
diff --git a/debian/patches/series b/debian/patches/series
index a1a5b54..71e520b 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
 do-not-backup-export-dir.patch
-fix-wconfd-metad

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