[pve-devel] r6524 - in vzctl/trunk: . debian

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-08-31 12:53:49 +0200 (Wed, 31 Aug 2011)
New Revision: 6524

Modified:
   vzctl/trunk/Makefile
   vzctl/trunk/debian/changelog
Log:
merge some fixes from upstream


Modified: vzctl/trunk/Makefile
===================================================================
--- vzctl/trunk/Makefile	2011-08-31 08:32:34 UTC (rev 6523)
+++ vzctl/trunk/Makefile	2011-08-31 10:53:49 UTC (rev 6524)
@@ -1,15 +1,21 @@
 RELEASE=1.8
 
 SVER=3.0.28
-PACKAGERELEASE=1pve2
+PACKAGERELEASE=1pve3
 ARCH=amd64
 
 PACKAGE=vzctl
 DEB=${PACKAGE}_${SVER}-${PACKAGERELEASE}_${ARCH}.deb
 
-# Wed, 24 Aug 2011 21:51:55
-VZCTL_BRANCH=42b34bf8839e07cb34c1e46b490a443774cc7e10
+#VZCTL_BRANCH=vzctl-3.0.28.3
 
+# last good before openvz bug 1971
+#VZCTL_BRANCH=2f6732431912069d5abf6b30024eadda5af54e2c
+
+# last good before bash syntax problems
+VZCTL_BRANCH=6fd51be9ddb44fd92ebe08c747b374151d69ca26
+
+
 all: ${DEB}
 
 vzctl-${SVER}.org/COPYING:

Modified: vzctl/trunk/debian/changelog
===================================================================
--- vzctl/trunk/debian/changelog	2011-08-31 08:32:34 UTC (rev 6523)
+++ vzctl/trunk/debian/changelog	2011-08-31 10:53:49 UTC (rev 6524)
@@ -1,6 +1,6 @@
-vzctl (3.0.28-1pve2) unstable; urgency=low
+vzctl (3.0.28-1pve3) unstable; urgency=low
 
-  * update to latest upstream
+  * merge some fixes from upstream
 
  -- Proxmox Support Team <support at proxmox.com>  Wed, 31 Aug 2011 10:20:13 +0200