Revision 1666206

Jump to revision:
Author:	kwall
Date:	Thu Mar 12 14:17:06 2015 UTC (9 years, 3 months ago)
Changed paths:	4
Log Message:	Merge from trunk

Changed paths

Path	Details
qpid/branches/QPID-6262-JavaBrokerNIO/	modified , props changed
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/	modified , props changed
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/	modified , props changed
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/JavaDerbyExcludes	modified , text changed