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/8b62c88e Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8b62c88e Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8b62c88e Branch: refs/heads/4.0.0-grouping Commit: 8b62c88e96823e9550e2da1651c2621e46d8b1d4 Parents: b859d66 fe63ca2 Author: Udara Liyanage <[email protected]> Authored: Thu Sep 25 20:45:13 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Thu Sep 25 20:45:13 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/monitor/application/ApplicationMonitor.java | 4 ++-- .../apache/stratos/autoscaler/monitor/group/GroupMonitor.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
