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/2e2e0cbd Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2e2e0cbd Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2e2e0cbd Branch: refs/heads/master Commit: 2e2e0cbda9b93e2af8b553611dc8fa18aeb73b0f Parents: 807548d 096398a Author: Imesh Gunaratne <[email protected]> Authored: Wed Dec 25 15:53:55 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Dec 25 15:53:55 2013 +0530 ---------------------------------------------------------------------- .../autoscaler/NetworkPartitionContext.java | 78 ++++++++++---------- .../stratos/autoscaler/PartitionContext.java | 14 ++-- .../autoscaler/algorithm/OneAfterAnother.java | 14 ++-- .../autoscaler/algorithm/RoundRobin.java | 25 +++---- .../topology/AutoscalerTopologyReceiver.java | 10 ++- .../stratos/autoscaler/util/AutoscalerUtil.java | 10 ++- .../distribution/src/main/conf/mincheck.drl | 2 +- 7 files changed, 81 insertions(+), 72 deletions(-) ----------------------------------------------------------------------
