tree 7fa009399d501d9ad3e9f77f735d85a2b75807cf
parent d31279a6374f4fd4326d04fdae456543547d441f
parent b66b4f357a756449c7e7184be4d963fb36f5b2d4
author Keith Wall <kwall@apache.org> 1426173196 +0000
committer Keith Wall <kwall@apache.org> 1426173196 +0000

Merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1666219 13f79535-47bb-0310-9956-ffa450edef68