summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2016-09-07 18:44:46 +0300
committerMichael Klishin <michael@clojurewerkz.org>2016-09-07 18:44:46 +0300
commitf887ff1a4b403a17040627fea1aa901ef23dbe30 (patch)
treeee851e9b1219d36f6cac59b257400f212494d358
parentddc7552cd50d6b226bcae809f1777de1d5f64dd3 (diff)
parentdc8a921682342e2b44a3dd59a76b08643ff3c0b5 (diff)
downloadrabbitmq-server-git-f887ff1a4b403a17040627fea1aa901ef23dbe30.tar.gz
merge branch stable
-rwxr-xr-xscripts/rabbitmq-server-ha.ocf1
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf
index c74525c936..63e5f700d9 100755
--- a/scripts/rabbitmq-server-ha.ocf
+++ b/scripts/rabbitmq-server-ha.ocf
@@ -332,7 +332,6 @@ $EXTENDED_OCF_PARAMS
<action name="status" timeout="20" />
<action name="monitor" depth="0" timeout="30" interval="5" />
<action name="monitor" depth="0" timeout="30" interval="3" role="Master"/>
-<action name="monitor" depth="30" timeout="60" interval="103" />
<action name="promote" timeout="30" />
<action name="demote" timeout="30" />
<action name="notify" timeout="20" />