summaryrefslogtreecommitdiff
path: root/scripts/rabbitmq-server
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-10-28 19:02:36 +0000
committerMatthew Sackman <matthew@lshift.net>2009-10-28 19:02:36 +0000
commit9c601a14bba52e9bf368c460290ce4c2b385e362 (patch)
tree191489e8402844eafa74cf18dea37526d9fdbf30 /scripts/rabbitmq-server
parent3783ff77bfc20e491e5fc9fc91061f5255179d44 (diff)
parent7ceb43e0e89469bbc55a1762c4a4467b2c3a9559 (diff)
downloadrabbitmq-server-git-9c601a14bba52e9bf368c460290ce4c2b385e362.tar.gz
merging bug 21457 into default
Diffstat (limited to 'scripts/rabbitmq-server')
-rwxr-xr-xscripts/rabbitmq-server4
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 67768c0e86..08ceb27d5b 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -109,9 +109,7 @@ exec erl \
-os_mon start_cpu_sup true \
-os_mon start_disksup false \
-os_mon start_memsup false \
- -os_mon start_os_sup false \
- -os_mon memsup_system_only true \
- -os_mon system_memory_high_watermark 0.95 \
+ -os_mon vm_memory_high_watermark 0.7 \
-mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \
${RABBITMQ_CLUSTER_CONFIG_OPTION} \
${RABBITMQ_SERVER_START_ARGS} \