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:51:20 UTC
[38/45] git commit: Merge pull request #1 from
sjcorbett/feature/brooklyn-catalogue-yaml
Merge pull request #1 from sjcorbett/feature/brooklyn-catalogue-yaml
Feature/brooklyn catalogue 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/343fe332
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/343fe332
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/343fe332
Branch: refs/heads/master
Commit: 343fe332ae86c1237eeabf8b9a506b69330033a2
Parents: d709b7e f03f52f
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Jul 3 18:28:55 2014 +0300
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Jul 3 18:28:55 2014 +0300
----------------------------------------------------------------------
.../brooklyn/camp/spi/pdp/DeploymentPlan.java | 27 +++++-
.../catalog/internal/BasicBrooklynCatalog.java | 24 +++++-
.../catalog/internal/CatalogLibrariesDto.java | 40 ++++++++-
.../brooklyn/camp/lite/CampYamlLiteTest.java | 13 ++-
.../camp/lite/test-app-service-blueprint.yaml | 9 ++
.../spi/creation/BrooklynEntityMatcher.java | 88 ++++++++++----------
.../spi/dsl/BrooklynDslInterpreter.java | 2 +-
7 files changed, 150 insertions(+), 53 deletions(-)
----------------------------------------------------------------------