Revision 1677957

Jump to revision:
Author:	rgodfrey
Date:	Wed May 6 10:49:50 2015 UTC (9 years, 1 month ago)
Changed paths:	2
Log Message:	Merge changes from trunk

Changed paths

Path	Details
qpid/branches/0.32.x/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TCPTransportProvider.java	modified , text changed
qpid/branches/0.32.x/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TransactionController.java	modified , text changed