diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-09-12 13:30:23 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-09-12 13:30:23 +0300 |
| commit | 60c2a6163fe1fbc360763f24c1456261fa7d22c2 (patch) | |
| tree | d32fb536c2c2e9abc595a02eb2ccc2a033f053a8 /scripts | |
| parent | acc39e857742cfb2ebbeb6675fd233913edf9552 (diff) | |
| parent | dc8a921682342e2b44a3dd59a76b08643ff3c0b5 (diff) | |
| download | rabbitmq-server-git-60c2a6163fe1fbc360763f24c1456261fa7d22c2.tar.gz | |
Merge branch 'stable' into rabbitmq-server-950
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-server-ha.ocf | 1 |
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" /> |