summaryrefslogtreecommitdiff
path: root/ebin
diff options
context:
space:
mode:
authorMichael Bridgen <mikeb@lshift.net>2009-11-04 11:56:02 +0000
committerMichael Bridgen <mikeb@lshift.net>2009-11-04 11:56:02 +0000
commit997ca6aa36dbec1e46321bb626c8e3e8e6193f10 (patch)
tree72c46d142c65249e46a1252a4a3dafc0fcd6d2bc /ebin
parent11b5c08721455051fef2dc547510a087c87ae9ea (diff)
parent3394efabb87ad14d20a8df7bd681345658594e09 (diff)
downloadrabbitmq-server-git-997ca6aa36dbec1e46321bb626c8e3e8e6193f10.tar.gz
Merge from default to get, among other things, better memory management and synchronous auto_deletes
Diffstat (limited to 'ebin')
-rw-r--r--ebin/rabbit_app.in3
1 files changed, 1 insertions, 2 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in
index dd907d1a02..39f98cbe56 100644
--- a/ebin/rabbit_app.in
+++ b/ebin/rabbit_app.in
@@ -20,5 +20,4 @@
{default_user, <<"guest">>},
{default_pass, <<"guest">>},
{default_vhost, <<"/">>},
- {default_permissions, [<<".*">>, <<".*">>, <<".*">>]},
- {memory_alarms, auto}]}]}.
+ {default_permissions, [<<".*">>, <<".*">>, <<".*">>]}]}]}.