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/66042d44 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/66042d44 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/66042d44 Branch: refs/heads/4.0.0-grouping Commit: 66042d444adb98f3e1b6af8f3afba31792f11a60 Parents: 787b554 f8ca4b2 Author: Isuru Haththotuwa <[email protected]> Authored: Thu Sep 25 11:50:32 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Thu Sep 25 11:50:32 2014 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/autoscaler/monitor/Monitor.java | 11 ++++++++--- .../monitor/application/ApplicationMonitor.java | 2 +- .../autoscaler/monitor/cluster/ClusterMonitor.java | 4 ++-- .../stratos/autoscaler/monitor/group/GroupMonitor.java | 2 +- .../apache/stratos/autoscaler/util/AutoscalerUtil.java | 8 +++++--- .../controller/internal/CloudControllerDSComponent.java | 12 +++++++++++- 6 files changed, 28 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
