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/1f7c7850 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1f7c7850 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1f7c7850 Branch: refs/heads/4.0.0-grouping Commit: 1f7c7850b370d93487429e29a5fdce2cdf2da775 Parents: 3d44620 f34747c Author: Udara Liyanage <[email protected]> Authored: Thu Sep 25 18:10:40 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Thu Sep 25 18:10:40 2014 +0530 ---------------------------------------------------------------------- .../monitor/application/ApplicationMonitor.java | 4 ++- .../autoscaler/monitor/group/GroupMonitor.java | 4 ++- .../status/checker/StatusChecker.java | 6 ++-- .../parser/DefaultApplicationParser.java | 1 + .../rest/endpoint/services/ServiceUtils.java | 29 +++++++++----------- 5 files changed, 23 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
