Merge branch 'master' into brooklyn-api-convenience-better-error-propagation
authorAlex Heneveld <alex.heneveld@cloudsoftcorp.com>
Tue, 9 May 2017 08:10:48 +0000 (09:10 +0100)
committerAlex Heneveld <alex.heneveld@cloudsoftcorp.com>
Tue, 9 May 2017 08:10:48 +0000 (09:10 +0100)
commit0260945ca098cb7efc072579a3f51be19dec4b6f
tree346b09c7a442efdd314e09863bfab257ff7b926a
parent23fdb1226a71ddfe304b48bea2d3db81cadf8c7e
parent0243386ce7ec5bfb20796afb39ee0e53e3858c88
Merge branch 'master' into brooklyn-api-convenience-better-error-propagation

imports conflict
java/pom.xml
java/src/main/java/org/apache/brooklyn/rest/client/BrooklynApi.java