Anthony Keenan af77c5a287 Merge remote-tracking branch 'open/master' into anthony-os-merge-20180418 ... # Conflicts: # constants.properties # docs/source/changelog.rst		2018-04-18 11:24:22 +01:00
..
src	Merge remote-tracking branch 'open/master' into anthony-os-merge-20180418	2018-04-18 11:24:22 +01:00
build.gradle	Shade the zookeeper libraries to avoid version conflicts	2018-04-17 12:07:09 +01:00