This closes #547
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4fb2c702 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4fb2c702 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4fb2c702 Branch: refs/heads/master Commit: 4fb2c702712b53111eb288803511764ceb778240 Parents: 584edcb ee3c578 Author: Alex Heneveld <[email protected]> Authored: Sat Mar 28 21:31:18 2015 -0500 Committer: Alex Heneveld <[email protected]> Committed: Sat Mar 28 21:31:18 2015 -0500 ---------------------------------------------------------------------- camp/README.md | 2 +- .../internal/EntityManagementSupport.java | 13 ++- .../persister/XmlMementoSerializerTest.java | 24 +++-- ...wareProcessDriverLifecycleEffectorTasks.java | 9 +- .../entity/basic/SoftwareProcessImpl.java | 9 +- .../entity/brooklynnode/BrooklynCluster.java | 19 ++-- .../BrooklynClusterIntegrationTest.java | 96 ++++++++++++++++++++ .../nosql/couchbase/CouchbaseCluster.java | 1 + .../nosql/couchbase/CouchbaseClusterImpl.java | 25 ++++- .../quickstart/src/brooklyn-sample/README.md | 2 +- .../test/resources/example-with-function.yaml | 2 +- .../src/test/resources/java-web-app-simple.yaml | 2 +- .../test/resources/test-app-with-enricher.yaml | 2 +- .../test/resources/test-app-with-policy.yaml | 2 +- .../test-cluster-with-member-spec.yaml | 2 +- .../resources/test-entity-basic-template.yaml | 2 +- .../test-entity-reference-map-template.yaml | 2 +- .../resources/test-entity-with-enricher.yaml | 2 +- .../resources/test-entity-with-init-config.yaml | 2 +- .../test/resources/test-entity-with-policy.yaml | 2 +- .../resources/test-propagating-enricher.yaml | 2 +- .../resources/test-referencing-enrichers.yaml | 2 +- .../resources/test-referencing-entities.yaml | 2 +- .../resources/test-referencing-policies.yaml | 2 +- usage/downstream-parent/pom.xml | 30 ++++++ .../blueprints/CouchbaseBlueprintTest.java | 69 ++++++++++++++ .../resources/couchbase-cluster-singleNode.yaml | 36 ++++++++ .../src/test/resources/couchbase-cluster.yaml | 33 +++++++ .../src/test/resources/couchbase-node.yaml | 26 ++++++ .../src/test/resources/couchbase-w-loadgen.yaml | 4 +- .../test/resources/couchbase-w-pillowfight.yaml | 2 +- .../launcher/src/test/resources/couchbase.yaml | 32 ------- .../src/test/resources/mongo-scripts.yaml | 2 +- 33 files changed, 375 insertions(+), 87 deletions(-) ----------------------------------------------------------------------
