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/daa18945 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/daa18945 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/daa18945 Branch: refs/heads/4.0.0-grouping Commit: daa18945658174dc29c75053cd6dbb862997bed7 Parents: 150ad62 5cf0730 Author: Udara Liyanage <[email protected]> Authored: Thu Sep 25 16:25:50 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Thu Sep 25 16:25:50 2014 +0530 ---------------------------------------------------------------------- .../AutoscalerTopologyEventReceiver.java | 42 ++++++++++++++- .../monitor/AbstractClusterMonitor.java | 18 ++++++- .../stratos/autoscaler/monitor/Monitor.java | 21 +++----- .../monitor/application/ApplicationMonitor.java | 55 ++++++++++++++++---- .../monitor/cluster/ClusterMonitor.java | 10 +--- .../monitor/cluster/LbClusterMonitor.java | 9 ---- .../events/ApplicationActivatedEvent.java | 42 +++++++++++++++ .../monitor/events/ClusterActivatedEvent.java | 49 ++++++++++++++++- .../events/ClusterInMaintenanceEvent.java | 20 ++++++- .../monitor/events/GroupActivatedEvent.java | 43 ++++++++++++++- .../monitor/events/GroupInMaintenanceEvent.java | 20 ++++++- .../autoscaler/monitor/events/MonitorEvent.java | 22 +++++++- .../monitor/events/MonitorStatusEvent.java | 42 +++++++++++++++ .../autoscaler/monitor/group/GroupMonitor.java | 28 ++++++++++ 14 files changed, 372 insertions(+), 49 deletions(-) ----------------------------------------------------------------------
