summaryrefslogtreecommitdiff
path: root/scripts/rabbitmq-server
diff options
context:
space:
mode:
authorMichael Bridgen <mikeb@lshift.net>2009-11-17 15:52:13 +0000
committerMichael Bridgen <mikeb@lshift.net>2009-11-17 15:52:13 +0000
commitbe0f4ad53d7a365686eef57e9f7edb157d9c98f4 (patch)
treef4af67f025c5ae17bcefca88c28d8ede837236e1 /scripts/rabbitmq-server
parent1950114f16206399ea00bf6434298767ed3a9f2f (diff)
parent4159a9a3afdc3fad8f5331c00321733ce398b7af (diff)
downloadrabbitmq-server-git-be0f4ad53d7a365686eef57e9f7edb157d9c98f4.tar.gz
Merge from default, to get recent work as well as support for field-array.
Diffstat (limited to 'scripts/rabbitmq-server')
-rwxr-xr-xscripts/rabbitmq-server1
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 34904850be..310afe9426 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -109,7 +109,6 @@ exec erl \
-os_mon start_cpu_sup true \
-os_mon start_disksup false \
-os_mon start_memsup false \
- -os_mon vm_memory_high_watermark 0.4 \
-mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \
${RABBITMQ_CLUSTER_CONFIG_OPTION} \
${RABBITMQ_SERVER_START_ARGS} \