Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/787d8b1c Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/787d8b1c Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/787d8b1c Branch: refs/heads/master Commit: 787d8b1ca667f0254d785102f7cd5ef61fb96124 Parents: 7ba1a8a fb79b03 Author: Imesh Gunaratne <[email protected]> Authored: Thu Dec 12 23:29:44 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Dec 12 23:29:44 2013 +0530 ---------------------------------------------------------------------- .../adc/mgt/listener/TopologyEventListner.java | 40 -- .../processor/ClusterStatusEventProcessor.java | 164 ------- .../CompleteTopologyEventProcessor.java | 122 ----- .../processor/InstanceStatusEventProcessor.java | 452 ------------------- .../event/processor/TopologyEventProcessor.java | 33 -- .../processor/TopologyEventProcessorChain.java | 65 --- .../stratos/autoscaler/ClusterMonitor.java | 1 + .../cloud/controller/CloudControllerClient.java | 7 +- .../health/HealthEventMessageDelegator.java | 2 +- .../rule/AutoscalerRuleEvaluator.java | 9 +- .../autoscaler/rule/RuleTasksDelegator.java | 2 +- .../stratos/autoscaler/util/AutoscalerUtil.java | 3 +- .../apache/stratos/cli/GenericRestClient.java | 4 +- .../java/org/apache/stratos/cli/RestClient.java | 4 +- .../stratos/cli/RestCommandLineService.java | 4 + .../cloud/controller/pojo/MemberContext.java | 17 +- .../main/resources/CloudControllerService.wsdl | 1 + 17 files changed, 35 insertions(+), 895 deletions(-) ----------------------------------------------------------------------
