Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/e11e713e Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e11e713e Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e11e713e Branch: refs/heads/master Commit: e11e713e8e4a79a93f37b337b57b5dc9a5668d85 Parents: 76a73c3 a411230 Author: Imesh Gunaratne <[email protected]> Authored: Mon Dec 16 11:54:30 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Mon Dec 16 11:54:30 2013 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/ClusterMonitor.java | 6 +- .../stratos/autoscaler/LbClusterMonitor.java | 6 +- .../autoscaler/partition/PartitionManager.java | 69 ++------------------ .../impl/CloudControllerServiceImpl.java | 43 +----------- .../controller/registry/RegistryManager.java | 24 ++++--- 5 files changed, 27 insertions(+), 121 deletions(-) ----------------------------------------------------------------------
