update to 3.1.7

diff --git a/Makefile b/Makefile
index 7e39ce78ee74c594de0cb86e50f7c51fa94a4e02..221c9af0292709b1f21dd0400381f9d74cb838f2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 RELEASE=2.0
 
-RHCVER=3.1.6
+RHCVER=3.1.7
 RHCBRANCH=origin/STABLE31
 
 RHCDIR=cluster-${RHCVER}

diff --git a/cluster-3.1.6.tar.gz b/cluster-3.1.6.tar.gz
deleted file mode 100644 (file)
index 5a49c48..0000000
Binary files a/cluster-3.1.6.tar.gz and /dev/null differ

diff --git a/cluster-3.1.7.tar.gz b/cluster-3.1.7.tar.gz
new file mode 100644 (file)
index 0000000..d1cfa77
Binary files /dev/null and b/cluster-3.1.7.tar.gz differ

diff --git a/debian/changelog b/debian/changelog
index 638a8758d200583d374ef2680072e9eb4c9058a8..b0ca4363e0a43b28f9df51f56092a1d23fd8159f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+redhat-cluster-pve (3.1.7-1) unstable; urgency=low
+
+  * update to upstream release 3.1.7
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 29 Sep 2011 11:03:50 +0200
+
 redhat-cluster-pve (3.1.6-1) unstable; urgency=low
 
   * update to upstream release 3.1.6

diff --git a/debian/patches/fix-rgmanager-init.diff b/debian/patches/fix-rgmanager-init.diff
index 91e3817d4e80e4c82148c5fcaed31d08f97b01c7..17c32ddbe13847350ec81b63729d6d8d60367db5 100644 (file)
--- a/debian/patches/fix-rgmanager-init.diff
+++ b/debian/patches/fix-rgmanager-init.diff
@@ -1,7 +1,7 @@
 Index: new/rgmanager/init.d/rgmanager.in
 ===================================================================
---- new.orig/rgmanager/init.d/rgmanager.in     2011-08-25 07:31:44.000000000 +0200
-+++ new/rgmanager/init.d/rgmanager.in  2011-08-30 11:57:34.000000000 +0200
+--- new.orig/rgmanager/init.d/rgmanager.in     2011-09-29 11:01:03.000000000 +0200
++++ new/rgmanager/init.d/rgmanager.in  2011-09-29 11:08:55.000000000 +0200
 @@ -6,10 +6,10 @@
  #
  ### BEGIN INIT INFO
@@ -28,15 +28,6 @@ Index: new/rgmanager/init.d/rgmanager.in
  success()
  {
        echo -ne "[  OK  ]\r"
-@@ -33,7 +37,7 @@
- status()
- {
-       pid=$(pidof $1 2>/dev/null)
--      rtrn=$?
-+      local rtrn=$?
-       if [ $rtrn -ne 0 ]; then
-               echo "$1 is stopped"
-       else
 @@ -52,8 +56,7 @@
  
  # deb based distros