tree e5956bcab8ca15e10a787ef4c2b39633c6c795da
parent 6de63bce6e61011a921337d9c3880e199f21c94c
parent 99231e1918fb20c750e7261f531d31ecec12b8f1
author Keith Wall <kwall@apache.org> 1396338102 +0000
committer Keith Wall <kwall@apache.org> 1396338102 +0000

NO-JIRA: Final merge from trunk before reintegration

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1583552 13f79535-47bb-0310-9956-ffa450edef68