diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-04-10 04:14:27 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-04-10 04:14:27 +0300 |
| commit | f6404b19e09ad2b14957f68fe7215fb7916ccbd5 (patch) | |
| tree | 497be9dd747f47676dd6a9476c93641961f1e4f5 /scripts | |
| parent | d2a29577ba430e871d01355474b520c447214103 (diff) | |
| parent | 64f57943434c4b699585427f19fa7f5125d19faf (diff) | |
| download | rabbitmq-server-git-f6404b19e09ad2b14957f68fe7215fb7916ccbd5.tar.gz | |
Merge branch 'master' into rabbitmq-management-163
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-server-ha.ocf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf index 5ead9a81ad..301f7a1fc7 100755 --- a/scripts/rabbitmq-server-ha.ocf +++ b/scripts/rabbitmq-server-ha.ocf @@ -1479,6 +1479,7 @@ get_monitor() { if [ -n "$master_name" ]; then ocf_log info "${LH} master exists and rabbit app is not running. Exiting to be restarted by pacemaker" + stop_server_process rc=$OCF_ERR_GENERIC fi fi |