tree 40a4180694bd80c7407b3f2e9daedd57f684918e
parent c8e816069d0209f1d1cc316888734eedf2db4f48
author Sam Bratton <sbratton@apache.org> 1552536103 +0000
committer Sam Bratton <sbratton@apache.org> 1552536103 +0000

merge ^/aries/trunk/proxy - r1844786 thru r1855479 into proxy

git-svn-id: https://svn.apache.org/repos/asf/aries/branches/java6support@1855481 13f79535-47bb-0310-9956-ffa450edef68