From 443eca6549dca94d66264d9c7c9c2b7e2760cbd0 Mon Sep 17 00:00:00 2001
From: "Rafael H. Schloming" <rhs@apache.org>
Date: Thu, 4 Jan 2007 22:11:38 +0000
Subject: 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
---
 java/broker/etc/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java/broker')

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>
-- 
cgit v1.2.1