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/b6dbaf65 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b6dbaf65 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b6dbaf65 Branch: refs/heads/master Commit: b6dbaf65508699effc5413043dc9a6e4189551dd Parents: e501cb1 52d9282 Author: Imesh Gunaratne <[email protected]> Authored: Thu Dec 19 15:30:47 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Dec 19 15:30:47 2013 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/AutoscalerContext.java | 3 + .../health/HealthEventMessageDelegator.java | 30 ++-- .../autoscaler/monitor/AbstractMonitor.java | 157 +++++++++++++++++- .../autoscaler/monitor/ClusterMonitor.java | 160 +------------------ .../autoscaler/monitor/LbClusterMonitor.java | 156 +----------------- .../topology/AutoscalerTopologyReceiver.java | 4 +- .../impl/CloudControllerServiceImpl.java | 1 + .../cartridge/agent/event/subscriber/Main.java | 4 +- .../src/main/bin/health-publisher.sh | 6 +- 9 files changed, 188 insertions(+), 333 deletions(-) ----------------------------------------------------------------------
