This closes #704
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/8f31efa8 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/8f31efa8 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/8f31efa8 Branch: refs/heads/0.7.0-incubating Commit: 8f31efa844499ebeefad11b82035ebb0b57a7c77 Parents: b7a290c 1deefdf Author: Alex Heneveld <[email protected]> Authored: Wed Jun 24 00:34:59 2015 -0700 Committer: Alex Heneveld <[email protected]> Committed: Wed Jun 24 00:34:59 2015 -0700 ---------------------------------------------------------------------- .../catalog/internal/BasicBrooklynCatalog.java | 4 +++ .../main/java/brooklyn/rest/api/CatalogApi.java | 13 ++++++++ .../rest/resources/CatalogResource.java | 5 +++ .../rest/resources/LocationResource.java | 34 ++++++++++++++++++-- .../rest/resources/ApiDocResourceTest.java | 2 +- 5 files changed, 54 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
