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/5894018c Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5894018c Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5894018c Branch: refs/heads/master Commit: 5894018c4782efa02e6770049c2a5810ce06be18 Parents: be8a4dd bd27963 Author: Imesh Gunaratne <[email protected]> Authored: Mon Nov 18 00:53:19 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Mon Nov 18 00:53:19 2013 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/ClusterContext.java | 5 +- .../algorithm/AutoscaleAlgorithm.java | 2 - .../autoscaler/algorithm/OneAfterAnother.java | 149 ++++++++----------- .../autoscaler/algorithm/RoundRobin.java | 8 +- .../impl/CloudControllerServiceImpl.java | 1 - 5 files changed, 65 insertions(+), 100 deletions(-) ----------------------------------------------------------------------
