From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 31 Aug 2011 08:10:16 +0000 (+0200)
Subject: update to latest stable upstream
X-Git-Url: https://git.proxmox.com/?p=redhat-cluster-pve.git;a=commitdiff_plain;h=5f80884e4eea48da1a477ceab66f82673e4b7ad9;hp=fabb166ecc8ff1f5bba304ee8345bffea7e88f31

update to latest stable upstream
---

diff --git a/cluster-3.1.6.tar.gz b/cluster-3.1.6.tar.gz
index 1027dcf..5a49c48 100644
Binary files a/cluster-3.1.6.tar.gz and b/cluster-3.1.6.tar.gz differ
diff --git a/debian/patches/fix-cman-init.diff b/debian/patches/fix-cman-init.diff
index ccd2b1a..a597e1d 100644
--- a/debian/patches/fix-cman-init.diff
+++ b/debian/patches/fix-cman-init.diff
@@ -1,8 +1,6 @@
 
  * check if cman_tool is installed
 
- * do not overwrite global return status 'rtrn' - use local keyword
-
 Index: new/cman/init.d/cman.in
 ===================================================================
 --- new.orig/cman/init.d/cman.in	2010-12-02 07:19:35.000000000 +0100
@@ -16,12 +14,3 @@ Index: new/cman/init.d/cman.in
  chkconfig2()
  {
  	case "$1" in
-@@ -46,7 +48,7 @@
- status()
- {
- 	pid=$(pidof $1 2>/dev/null)
--	rtrn=$?
-+	local rtrn=$?
- 	if [ $rtrn -ne 0 ]; then
- 		echo "$1 is stopped"
- 	else