Merge remote-tracking branch 'origin/docker-grouping-merge' into docker-grouping-merge
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f55d5447 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f55d5447 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f55d5447 Branch: refs/heads/docker-grouping-merge Commit: f55d5447e0ca126e1d3d4a989d9129d1830142b4 Parents: c8dc8cc 2a6606f Author: Imesh Gunaratne <[email protected]> Authored: Tue Nov 4 16:58:16 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Nov 4 16:58:16 2014 +0530 ---------------------------------------------------------------------- .../status/checker/StatusChecker.java | 27 +++++++++----------- .../controller/topology/TopologyBuilder.java | 2 ++ .../manager/client/AutoscalerServiceClient.java | 2 +- .../category/DefaultLoadBalancerCategory.java | 2 +- .../ServiceLevelLoadBalancerCategory.java | 2 +- 5 files changed, 17 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/f55d5447/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java ----------------------------------------------------------------------
