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 2017/10/06 08:09:33 UTC
[4/6] brooklyn-server git commit: Merge branch 'tasks-better-tree'
into adjunct-activities-rest-api
Merge branch 'tasks-better-tree' into adjunct-activities-rest-api
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/cea2d347
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/cea2d347
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/cea2d347
Branch: refs/heads/master
Commit: cea2d347ff0bbace90d4787519e252553ae13cf8
Parents: b042989 9213f0e
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Oct 4 16:06:21 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Oct 4 16:06:21 2017 +0100
----------------------------------------------------------------------
.../brooklyn/api/mgmt/ExecutionContext.java | 16 +--
.../brooklyn/api/mgmt/SubscriptionManager.java | 6 +-
.../brooklyn/core/entity/AbstractEntity.java | 1 +
.../core/entity/trait/StartableMethods.java | 6 +-
.../core/location/BasicMachineDetails.java | 5 +-
.../location/access/BrooklynAccessUtils.java | 2 +-
.../mgmt/internal/LocalSubscriptionManager.java | 108 +++++++++++++------
.../core/objs/proxy/EntityProxyImpl.java | 2 +-
.../brooklyn/core/sensor/AttributeMap.java | 15 ++-
.../entity/group/DynamicClusterImpl.java | 7 +-
.../brooklyn/util/core/task/DynamicTasks.java | 74 ++++++++-----
.../apache/brooklyn/util/core/task/Tasks.java | 6 +-
.../core/effector/EffectorSayHiTest.java | 2 +-
.../core/entity/EntitySubscriptionTest.java | 9 +-
.../apache/brooklyn/core/feed/PollerTest.java | 2 +-
.../internal/LocalSubscriptionManagerTest.java | 91 ++++++++++++++++
.../core/mgmt/rebind/RebindManagerTest.java | 13 +--
.../policy/basic/PolicySubscriptionTest.java | 35 ++++--
.../entity/group/DynamicClusterTest.java | 8 +-
.../SameServerDriverLifecycleEffectorTasks.java | 5 +-
.../java/org/apache/brooklyn/test/Asserts.java | 20 +++-
.../org/apache/brooklyn/test/AssertsTest.java | 17 +++
22 files changed, 331 insertions(+), 119 deletions(-)
----------------------------------------------------------------------