Merge branch 'highlights-adjuncts' into adjunct-rest-api-and-highlights-2
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/2860af56 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/2860af56 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/2860af56 Branch: refs/heads/master Commit: 2860af56a7e77de8742fb3b6a0c22903f33e3a6b Parents: 80a4c25 7170846 Author: Alex Heneveld <[email protected]> Authored: Wed Sep 13 16:52:27 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Wed Sep 13 16:52:27 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/api/objs/HighlightTuple.java | 23 ++-- .../core/enricher/AbstractEnricher.java | 19 +++- .../entity/lifecycle/ServiceStateLogic.java | 3 + .../apache/brooklyn/core/feed/AbstractFeed.java | 16 ++- .../core/feed/AttributePollHandler.java | 2 + .../org/apache/brooklyn/core/feed/Poller.java | 20 +++- .../core/objs/AbstractEntityAdjunct.java | 104 ++++++++++++++++++- .../enricher/stock/AbstractAggregator.java | 12 +++ .../stock/AbstractMultipleSensorAggregator.java | 2 - .../enricher/stock/AbstractTransformer.java | 3 + .../stock/AbstractTypeTransformingEnricher.java | 3 + .../brooklyn/enricher/stock/Aggregator.java | 5 + .../brooklyn/enricher/stock/Combiner.java | 2 + .../apache/brooklyn/enricher/stock/Joiner.java | 1 + .../brooklyn/enricher/stock/Propagator.java | 6 ++ .../brooklyn/enricher/stock/UpdatingMap.java | 2 + .../enricher/stock/reducer/Reducer.java | 1 + .../group/AbstractMembershipTrackingPolicy.java | 23 +++- .../SshCommandMembershipTrackingPolicy.java | 15 ++- .../core/policy/basic/BasicPolicyTest.java | 9 +- .../policy/autoscaling/AutoScalerPolicy.java | 62 +++++++---- .../brooklyn/policy/ha/ServiceReplacer.java | 46 ++++---- .../brooklyn/policy/ha/ServiceRestarter.java | 9 +- .../autoscaling/AutoScalerPolicyRebindTest.java | 5 +- .../testing/mocks/RestMockSimplePolicy.java | 4 +- .../entity/machine/pool/ServerPoolImpl.java | 1 + .../software/base/SoftwareProcessImpl.java | 3 + .../brooklynnode/SelectMasterEffectorTest.java | 2 +- 28 files changed, 329 insertions(+), 74 deletions(-) ----------------------------------------------------------------------
