Merge branch 'docker-grouping-merge' of https://git-wip-us.apache.org/repos/asf/stratos 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/15aea18e Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/15aea18e Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/15aea18e Branch: refs/heads/docker-grouping-merge Commit: 15aea18e77e1db1de78bed2262f981fe03918ef4 Parents: 08de40f be88858 Author: R-Rajkumar <[email protected]> Authored: Thu Oct 30 15:20:55 2014 +0530 Committer: R-Rajkumar <[email protected]> Committed: Thu Oct 30 15:20:55 2014 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.autoscaler/pom.xml | 1 - .../internal/AutoscalerServerComponent.java | 22 +- .../monitor/AbstractClusterMonitor.java | 46 ++- .../monitor/ApplicationMonitorFactory.java | 127 +------- .../KubernetesServiceClusterMonitor.java | 8 +- .../autoscaler/monitor/VMLbClusterMonitor.java | 30 +- .../monitor/VMServiceClusterMonitor.java | 40 +-- .../monitor/cluster/ClusterMonitor.java | 293 ------------------- .../monitor/cluster/LbClusterMonitor.java | 129 -------- .../status/checker/StatusChecker.java | 15 +- 10 files changed, 108 insertions(+), 603 deletions(-) ----------------------------------------------------------------------
