summaryrefslogtreecommitdiff
path: root/java/broker
diff options
context:
space:
mode:
authorRafael H. Schloming <rhs@apache.org>2007-01-04 22:11:38 +0000
committerRafael H. Schloming <rhs@apache.org>2007-01-04 22:11:38 +0000
commit443eca6549dca94d66264d9c7c9c2b7e2760cbd0 (patch)
tree1a8f6c355127d77dcf59ea400e3744e49e5538f2 /java/broker
parent32df4fc8cdb72528c2ff718c821b7588ee87990c (diff)
downloadqpid-python-443eca6549dca94d66264d9c7c9c2b7e2760cbd0.tar.gz
svn merge -r492717:492730 from the trunk
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@492777 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker')
-rw-r--r--java/broker/etc/config.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/broker/etc/config.xml b/java/broker/etc/config.xml
index 7f3eb129d5..61e0e55138 100644
--- a/java/broker/etc/config.xml
+++ b/java/broker/etc/config.xml
@@ -69,7 +69,7 @@
<class>org.apache.qpid.server.security.auth.amqplain.AmqPlainInitialiser</class>
<principal-database>passwordfile</principal-database>
</initialiser>
- </mechanism>-->
+ </mechanism>
<mechanism>
<initialiser>
<class>org.apache.qpid.server.security.auth.plain.PlainInitialiser</class>