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/9075e871 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9075e871 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9075e871 Branch: refs/heads/4.0.0-grouping Commit: 9075e87169ed7c3156acbc4bd25aeea57faae19c Parents: 82701ff 67b281e Author: Udara Liyanage <[email protected]> Authored: Mon Oct 13 11:53:39 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Mon Oct 13 11:53:39 2014 +0530 ---------------------------------------------------------------------- .../grouping/dependency/DependencyBuilder.java | 18 +- .../monitor/application/ApplicationMonitor.java | 6 +- .../autoscaler/monitor/group/GroupMonitor.java | 6 +- .../status/checker/StatusChecker.java | 62 +++++- .../application/parser/ParserUtils.java | 4 +- .../CompositeApplicationParseTest.java | 209 +++++++++++++++++++ .../topology/GroupActivatedProcessor.java | 4 +- 7 files changed, 278 insertions(+), 31 deletions(-) ----------------------------------------------------------------------
