summaryrefslogtreecommitdiff
path: root/ebin
diff options
context:
space:
mode:
authorJerry Kuch <jerryk@vmware.com>2010-12-16 10:38:48 -0800
committerJerry Kuch <jerryk@vmware.com>2010-12-16 10:38:48 -0800
commitee6d77595a3b390e9d3153fac14f3936091851ac (patch)
tree251646c1d561a73eeb9df78b6016d001406e6fcd /ebin
parentf7527b26d62a899357e07db2004486124d63353e (diff)
parentb0961fe47618356c79c63f73fe6e33392feca102 (diff)
downloadrabbitmq-server-git-ee6d77595a3b390e9d3153fac14f3936091851ac.tar.gz
Large-ish 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']} ]} ]}.