Repository: brooklyn-library Updated Branches: refs/heads/master 8a57ff78d -> fdad773c5
Don't allow multiple context entities in a task's tags Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/282194bd Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/282194bd Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/282194bd Branch: refs/heads/master Commit: 282194bdb6fba6533243509139717e1b9fe6257f Parents: f1ff646 Author: Svetoslav Neykov <svetoslav.ney...@cloudsoftcorp.com> Authored: Tue Nov 1 18:26:49 2016 +0200 Committer: Svetoslav Neykov <svetoslav.ney...@cloudsoftcorp.com> Committed: Tue Nov 1 18:26:49 2016 +0200 ---------------------------------------------------------------------- .../apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java | 1 - .../apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/282194bd/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java index d356fc5..63eaf81 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java @@ -310,7 +310,6 @@ public class MySqlClusterImpl extends DynamicClusterImpl implements MySqlCluster DynamicTasks.submitTopLevelTask(TaskBuilder.builder() .displayName("setup master-slave replication") .body(nodeInitTaskBody) - .tag(BrooklynTaskTags.tagForContextEntity(node)) .tag(BrooklynTaskTags.NON_TRANSIENT_TASK_TAG) .build(), node); http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/282194bd/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java index 68d3a54..4dc9bbd 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java @@ -252,7 +252,7 @@ public class CouchbaseNodeImpl extends SoftwareProcessImpl implements CouchbaseN if (toClusterO instanceof String) { toClusterO = getManagementContext().lookup((String)toClusterO); } - Entity toCluster = Tasks.resolving(toClusterO, Entity.class).context(getExecutionContext()).get(); + Entity toCluster = Tasks.resolving(toClusterO, Entity.class).context(this).get(); String fromBucket = Preconditions.checkNotNull( (String)ruleArgs.getStringKey("fromBucket"), "fromBucket must be specified" );
