enable two-primaries in global config, bump version to 8.9.2-2

diff --git a/Makefile b/Makefile
index 84a3f27f062081ccb5f4bf65dfbf73c9c2da26aa..3623221680eb10b6e2427464dceaa8e701569806 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=4.0
 
 PACKAGE=drbd-utils
-PKGREL=1
+PKGREL=2
 
 DRBDVER=8.9.2
 DRBDDIR=${PACKAGE}

diff --git a/debian/changelog b/debian/changelog
index a7c7ef3192ed89290f6dd3d95499c78084fab67b..3ff09e92d6eb913340309eb030224b2eb2bd23f8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+drbd-utils (8.9.2-2) unstable; urgency=medium
+
+  * enable two-primaries in global config
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 06 Jun 2015 10:37:06 +0200
+
 drbd-utils (8.9.2-1) unstable; urgency=medium
 
   * update to 8.9.2

diff --git a/debian/patches/enable-two-primaries.patch b/debian/patches/enable-two-primaries.patch
new file mode 100644 (file)
index 0000000..fa1d767
--- /dev/null
+++ b/debian/patches/enable-two-primaries.patch
@@ -0,0 +1,12 @@
+Index: new/scripts/global_common.conf
+===================================================================
+--- new.orig/scripts/global_common.conf
++++ new/scripts/global_common.conf
+@@ -41,6 +41,7 @@ common {
+       }
+ 
+       net {
++              allow-two-primaries yes;
+               # protocol timeout max-epoch-size max-buffers unplug-watermark
+               # connect-int ping-int sndbuf-size rcvbuf-size ko-count
+               # allow-two-primaries cram-hmac-alg shared-secret after-sb-0pri

diff --git a/debian/patches/series b/debian/patches/series
index 6f8bf4eccfceb5970185c8b3a8ab7a7b243cbab9..7293770018e35eb27aaa0444645ce3b530428f35 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-drbd-path-in-systemd-service.patch
+enable-two-primaries.patch