Author: kwall
Date: Tue Mar 3 16:25:55 2015
New Revision: 1663733
URL: http://svn.apache.org/r1663733
Log:
merge from trunk
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/ (props changed)
Propchange: qpid/branches/QPID-6262-JavaBrokerNIO/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 3 16:25:55 2015
@@ -3,4 +3,4 @@
/qpid/branches/java-broker-bdb-ha2:1576683-1583556
/qpid/branches/java-network-refactor:805429-825319
/qpid/branches/mcpierce-QPID-4719:1477004-1477093
-/qpid/trunk:1643238-1663687
+/qpid/trunk:1643238-1663731
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
