Author: robbie Date: Tue Dec 22 20:11:56 2009 New Revision: 893301 URL: http://svn.apache.org/viewvc?rev=893301&view=rev Log: QPID-2155: remove stray character causing parser warnings during broker startup
merge from r892761 Modified: qpid/trunk/ (props changed) qpid/trunk/qpid/java/ (props changed) qpid/trunk/qpid/java/broker/ (props changed) qpid/trunk/qpid/java/broker/etc/log4j.xml Propchange: qpid/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 22 20:11:56 2009 @@ -1 +1,2 @@ +/qpid/branches/0.5.x-dev:892761 /qpid/branches/java-network-refactor:805429-825319 Propchange: qpid/trunk/qpid/java/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 22 20:11:56 2009 @@ -1,5 +1,5 @@ /qpid/branches/0.5.x-dev:886720-886722 -/qpid/branches/0.5.x-dev/qpid/java:886720-886722,887145 +/qpid/branches/0.5.x-dev/qpid/java:886720-886722,887145,892761 /qpid/branches/java-broker-0-10/qpid/java:795950-829653 /qpid/branches/java-network-refactor/qpid/java:805429-821809 /qpid/trunk/qpid:796646-796653 Propchange: qpid/trunk/qpid/java/broker/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 22 20:11:56 2009 @@ -1,4 +1,4 @@ -/qpid/branches/0.5.x-dev/qpid/java/broker:886720-886722,887145 +/qpid/branches/0.5.x-dev/qpid/java/broker:886720-886722,887145,892761 /qpid/branches/java-broker-0-10/qpid/java/broker:795950-829653 /qpid/branches/java-network-refactor/qpid/java/broker:805429-821809 /qpid/branches/jmx_mc_gsoc09/qpid/java/broker:787599 Modified: qpid/trunk/qpid/java/broker/etc/log4j.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/log4j.xml?rev=893301&r1=893300&r2=893301&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker/etc/log4j.xml (original) +++ qpid/trunk/qpid/java/broker/etc/log4j.xml Tue Dec 22 20:11:56 2009 @@ -58,7 +58,7 @@ <layout class="org.apache.log4j.PatternLayout"> <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/> - </layout>` + </layout> </appender> <appender class="org.apache.log4j.FileAppender" name="FileAppender"> --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org