summaryrefslogtreecommitdiff
path: root/scripts/rabbitmq-server
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2008-12-05 09:31:03 +0000
committerMatthias Radestock <matthias@lshift.net>2008-12-05 09:31:03 +0000
commitdafac6b5b795d388b67cca7743e2d0d3a7d698ea (patch)
tree55213ac76a9b152ebc012cc5fe65d8a5d3596a0a /scripts/rabbitmq-server
parentb81de62c0f32ee685ce662a29fa53e8421eff494 (diff)
parentb86b36403118cb3ade913af785b2533e3e762984 (diff)
downloadrabbitmq-server-git-dafac6b5b795d388b67cca7743e2d0d3a7d698ea.tar.gz
merge default into bug19900
Diffstat (limited to 'scripts/rabbitmq-server')
-rwxr-xr-xscripts/rabbitmq-server2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index fba2f02681..1ce5458e53 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -66,7 +66,7 @@ exec erl \
-sasl sasl_error_logger '{file,"'${SASL_LOGS}'"}' \
-os_mon start_cpu_sup true \
-os_mon start_disksup false \
- -os_mon start_memsup true \
+ -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 \