tree c403e69dddbac64afb9db92a73352626f9a80b96
parent 39a5fa78073a2db52929ba5ef9d685356630e581
parent 6789e558d92ed341d1655f59a8a4daddbf68dfb1
author Robert Gemmell <robbie@apache.org> 1500377118 +0100
committer Robert Gemmell <robbie@apache.org> 1500377118 +0100

PROTON-1486: merge changes by Keith and Rob. This closes #9