Merge branch '4.0.0-grouping' of https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0-grouping
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ce7e93bf Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ce7e93bf Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ce7e93bf Branch: refs/heads/4.0.0-grouping Commit: ce7e93bf99250fbda2d9630dc7c65ed838f730ae Parents: c4740c0 5aac10e Author: Udara Liyanage <[email protected]> Authored: Wed Oct 1 10:12:42 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Wed Oct 1 10:12:42 2014 +0530 ---------------------------------------------------------------------- .../AutoscalerTopologyEventReceiver.java | 20 ++++++++++-- .../autoscaler/monitor/group/GroupMonitor.java | 33 +++++++++++--------- .../status/checker/StatusChecker.java | 13 ++++++-- .../stratos/autoscaler/util/AutoscalerUtil.java | 1 + .../parser/DefaultApplicationParser.java | 14 ++++++--- .../controller/topology/TopologyBuilder.java | 4 +-- .../conf/LoadBalancerConfiguration.java | 2 +- .../messaging/domain/topology/Cluster.java | 10 +++++- .../ApplicationStatusEventMessageDelegator.java | 17 ++++------ .../registry/CarbonRegistry.java | 11 +++++-- 10 files changed, 84 insertions(+), 41 deletions(-) ----------------------------------------------------------------------
