summaryrefslogtreecommitdiff
path: root/ebin
diff options
context:
space:
mode:
authorMichael Bridgen <mikeb@lshift.net>2009-12-18 15:36:58 +0000
committerMichael Bridgen <mikeb@lshift.net>2009-12-18 15:36:58 +0000
commit21b9b3d0d7c337fd562e2d03610a7fd8ea1b03dc (patch)
tree28a5906c4f5c68d165ef45c30e89f30aa57e2e56 /ebin
parentc706e4f9d3daebd9ed992e3280ff2b0b921af347 (diff)
parentd74a371b279a99373f5580084879b5e12e2a8e62 (diff)
downloadrabbitmq-server-git-21b9b3d0d7c337fd562e2d03610a7fd8ea1b03dc.tar.gz
Merge no-pluggable-exchange branch into v1.7-series branch.
Diffstat (limited to 'ebin')
-rw-r--r--ebin/rabbit_app.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in
index dd907d1a02..3616fcbf6c 100644
--- a/ebin/rabbit_app.in
+++ b/ebin/rabbit_app.in
@@ -17,8 +17,8 @@
{env, [{tcp_listeners, [{"0.0.0.0", 5672}]},
{ssl_listeners, []},
{ssl_options, []},
+ {vm_memory_high_watermark, 0.4},
{default_user, <<"guest">>},
{default_pass, <<"guest">>},
{default_vhost, <<"/">>},
- {default_permissions, [<<".*">>, <<".*">>, <<".*">>]},
- {memory_alarms, auto}]}]}.
+ {default_permissions, [<<".*">>, <<".*">>, <<".*">>]}]}]}.