Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/70c184f8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/70c184f8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/70c184f8 Branch: refs/heads/master Commit: 70c184f87f6789f557175ef5d2940ab816272103 Parents: a1fea08 314a589 Author: Udara Liyanage <[email protected]> Authored: Wed Dec 18 17:02:40 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Wed Dec 18 17:02:40 2013 -0500 ---------------------------------------------------------------------- .../stratos/autoscaler/AutoscalerContext.java | 4 ++ .../health/HealthEventMessageDelegator.java | 2 +- .../autoscaler/monitor/AbstractMonitor.java | 8 ++- .../autoscaler/monitor/ClusterMonitor.java | 35 +++++++++---- .../autoscaler/monitor/LbClusterMonitor.java | 51 ++++++++++++------- .../topology/AutoscalerTopologyReceiver.java | 53 ++++++++++++++++---- .../stratos/cli/RestCommandLineService.java | 12 ++--- .../stratos/cli/commands/SubscribeCommand.java | 16 +++--- .../impl/CloudControllerServiceImpl.java | 2 +- .../controller/topology/TopologyBuilder.java | 3 +- 10 files changed, 128 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/70c184f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/topology/AutoscalerTopologyReceiver.java ----------------------------------------------------------------------
