remove enable-two-primaries.patch

We need to use "drbdmanage net-options ..." instead.

diff --git a/debian/patches/enable-two-primaries.patch b/debian/patches/enable-two-primaries.patch
deleted file mode 100644 (file)
index fa1d767..0000000
--- a/debian/patches/enable-two-primaries.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 3e7491dffb7c06ab3d067d62169fedd82491fea9..2e2aa73462a29714b23147bac5ff1343fd93ca92 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-enable-two-primaries.patch
 fix-drbd-service-mode.patch