summaryrefslogtreecommitdiff
path: root/ebin
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2010-12-13 10:43:02 +0000
committerSimon MacMullen <simon@rabbitmq.com>2010-12-13 10:43:02 +0000
commitf6144f6cd96dadf3db89f524099deb6e30a64dca (patch)
treebb041588c3a48b7d5d39c7e298e224a1d651a6c7 /ebin
parent12f170a59ab4ed7dcc9ccd976d7ab027c1ec515b (diff)
parent57911250d3f6951ec73457e3b0c495674c655b61 (diff)
downloadrabbitmq-server-git-f6144f6cd96dadf3db89f524099deb6e30a64dca.tar.gz
Merge from default.
Diffstat (limited to 'ebin')
-rw-r--r--ebin/rabbit_app.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in
index 6c33ef8b16..3888f19843 100644
--- a/ebin/rabbit_app.in
+++ b/ebin/rabbit_app.in
@@ -30,4 +30,5 @@
{default_permissions, [<<".*">>, <<".*">>, <<".*">>]},
{cluster_nodes, []},
{server_properties, []},
- {collect_statistics, none}]}]}.
+ {collect_statistics, none},
+ {auth_mechanisms, ['PLAIN', 'AMQPLAIN']} ]} ]}.