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/09/16 01:52:06 UTC
[7/7] brooklyn-server git commit: This closes #818
This closes #818
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c9f7b0dc
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c9f7b0dc
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c9f7b0dc
Branch: refs/heads/master
Commit: c9f7b0dc56c2f0a8cf43c7f3ceb9f3507e1cfcaf
Parents: 001730b 13c368a
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Sat Sep 16 02:51:44 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Sat Sep 16 02:51:44 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 | 103 ++++++++++++++++++-
.../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 +-
.../stock/TransformingEnricherTest.java | 7 +-
.../policy/autoscaling/AutoScalerPolicy.java | 62 +++++++----
.../policy/ha/ServiceFailureDetector.java | 4 +-
.../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 +-
30 files changed, 334 insertions(+), 79 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c9f7b0dc/core/src/main/java/org/apache/brooklyn/enricher/stock/AbstractAggregator.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c9f7b0dc/core/src/main/java/org/apache/brooklyn/enricher/stock/AbstractTransformer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c9f7b0dc/core/src/main/java/org/apache/brooklyn/enricher/stock/Aggregator.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c9f7b0dc/core/src/main/java/org/apache/brooklyn/enricher/stock/Combiner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c9f7b0dc/core/src/main/java/org/apache/brooklyn/enricher/stock/Joiner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c9f7b0dc/core/src/main/java/org/apache/brooklyn/enricher/stock/UpdatingMap.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c9f7b0dc/core/src/main/java/org/apache/brooklyn/enricher/stock/reducer/Reducer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c9f7b0dc/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java
----------------------------------------------------------------------
diff --cc policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java
index 0bcdd76,0ce3f9c..baa3871
--- a/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java
+++ b/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java
@@@ -30,9 -30,10 +30,11 @@@ import java.util.concurrent.TimeUnit
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.brooklyn.api.catalog.Catalog;
+import org.apache.brooklyn.api.catalog.CatalogConfig;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.EntityLocal;
+ import org.apache.brooklyn.api.mgmt.Task;
+ import org.apache.brooklyn.api.objs.HighlightTuple;
import org.apache.brooklyn.api.policy.PolicySpec;
import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.api.sensor.Sensor;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c9f7b0dc/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceFailureDetector.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c9f7b0dc/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceReplacer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c9f7b0dc/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceRestarter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c9f7b0dc/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java
----------------------------------------------------------------------