Merge branch 'master' into osgi-auto-wrap-yaml
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/ce850074 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/ce850074 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/ce850074 Branch: refs/heads/master Commit: ce8500741a4bdc86568342d75b968ead241f9fdd Parents: 915e3bf 3d8675e Author: Alex Heneveld <[email protected]> Authored: Fri Jun 30 17:03:04 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Fri Jun 30 17:03:04 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/brooklyn/rest/resources/CatalogResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
