summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2016-04-05 21:29:32 +0300
committerMichael Klishin <mklishin@pivotal.io>2016-04-05 21:29:32 +0300
commit3fd6c009db4375e36a95c3390fc161a58f09e3ea (patch)
tree05dc03acf8c262babe920260a1cd00d39899dc68
parentab9ebd59ab2d43030a84e3ed9d4550b8929ab522 (diff)
parent71a7cc423d2e3760adf0f3cbe26c278f9b2eec5a (diff)
downloadrabbitmq-server-git-3fd6c009db4375e36a95c3390fc161a58f09e3ea.tar.gz
Merge branch 'master' into rabbitmq-server-691
-rwxr-xr-xscripts/rabbitmq-server-ha.ocf4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf
index ae7991833b..5ead9a81ad 100755
--- a/scripts/rabbitmq-server-ha.ocf
+++ b/scripts/rabbitmq-server-ha.ocf
@@ -678,8 +678,8 @@ reset_mnesia() {
# remove mnesia files, if required
if $make_amnesia ; then
kill_rmq_and_remove_pid
- ocf_run rm -rf "${MNESIA_FILES}/*"
- ocf_log warn "${LH} Mnesia files appear corrupted and have been removed."
+ ocf_run rm -rf "${MNESIA_FILES}"
+ ocf_log warn "${LH} Mnesia files appear corrupted and have been removed from ${MNESIA_FILES}."
fi
# always return OCF SUCCESS
return $OCF_SUCCESS