summaryrefslogtreecommitdiff
path: root/ebin
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 /ebin
parent3783ff77bfc20e491e5fc9fc91061f5255179d44 (diff)
parent7ceb43e0e89469bbc55a1762c4a4467b2c3a9559 (diff)
downloadrabbitmq-server-git-9c601a14bba52e9bf368c460290ce4c2b385e362.tar.gz
merging bug 21457 into default
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, [<<".*">>, <<".*">>, <<".*">>]}]}]}.