summaryrefslogtreecommitdiff
path: root/qpid/java/test-profiles
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2015-01-27 15:00:13 +0000
committerKeith Wall <kwall@apache.org>2015-01-27 15:00:13 +0000
commite1eb5a92b2765ba9ad7178d2a1c8564d44f6d608 (patch)
treed39af2dcd93f877b333e53945f162adc307cc6bd /qpid/java/test-profiles
parent57f62fb2e1dc7bb04a2bee4072992fb00f310126 (diff)
parentba8cfe1b129a69bf976ac8aaabb08b32ee2ab8cc (diff)
parentd6ad905aa5da8b0c4be507c87cdae735d778154f (diff)
downloadqpid-python-e1eb5a92b2765ba9ad7178d2a1c8564d44f6d608.tar.gz
Merge from trunk
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1655057 13f79535-47bb-0310-9956-ffa450edef68