You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/07/04 11:50:59 UTC
[17/45] git commit: Merge pull request #1 from
aledsage/sjcorbett/yaml-context
Merge pull request #1 from aledsage/sjcorbett/yaml-context
REST api for adding catalog item using yaml
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/acd41f71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/acd41f71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/acd41f71
Branch: refs/heads/master
Commit: acd41f71769cd94a10dffd78e902e042c35186c2
Parents: 30093bb b3d2c03
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Tue Jul 1 14:29:18 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Tue Jul 1 14:29:18 2014 +0100
----------------------------------------------------------------------
.../java/brooklyn/catalog/BrooklynCatalog.java | 8 ++++
.../catalog/internal/BasicBrooklynCatalog.java | 15 +++++++
.../main/java/brooklyn/rest/api/CatalogApi.java | 14 +++----
.../rest/resources/CatalogResource.java | 26 ++++++++++--
.../rest/util/BrooklynRestResourceUtils.java | 3 +-
.../rest/util/DefaultExceptionMapper.java | 2 +-
.../rest/resources/CatalogResourceTest.java | 43 ++++++++++----------
7 files changed, 77 insertions(+), 34 deletions(-)
----------------------------------------------------------------------