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/7778756a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7778756a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7778756a Branch: refs/heads/4.0.0-grouping Commit: 7778756ad345bb94f951ea41fdd4107fbb6c9bc3 Parents: 0aeed04 d7eb101 Author: Isuru Haththotuwa <[email protected]> Authored: Mon Oct 6 17:12:47 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Mon Oct 6 17:12:47 2014 +0530 ---------------------------------------------------------------------- .../grouping/dependency/DependencyBuilder.java | 2 +- .../grouping/dependency/DependencyTree.java | 55 ++++++++++--- .../stratos/autoscaler/monitor/Monitor.java | 84 +++++++++++--------- .../monitor/application/ApplicationMonitor.java | 12 +-- .../autoscaler/monitor/group/GroupMonitor.java | 9 --- 5 files changed, 95 insertions(+), 67 deletions(-) ----------------------------------------------------------------------
