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/b0c1351d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b0c1351d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b0c1351d Branch: refs/heads/master Commit: b0c1351da0b94c8668a54f8663ed16298af5f827 Parents: ac267af 769e0af Author: Imesh Gunaratne <[email protected]> Authored: Thu Dec 12 11:38:38 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Dec 12 11:38:38 2013 +0530 ---------------------------------------------------------------------- .../autoscaler/NetworkPartitionContext.java | 43 +++++-- .../autoscaler/algorithm/OneAfterAnother.java | 14 +-- .../autoscaler/algorithm/RoundRobin.java | 16 +-- .../cloud/controller/CloudControllerClient.java | 1 + .../internal/AutoscalerServerComponent.java | 13 +- .../health/HealthEventMessageDelegator.java | 14 ++- .../autoscaler/partition/PartitionManager.java | 4 - .../rule/AutoscalerRuleEvaluator.java | 122 +++---------------- .../autoscaler/rule/ExecutorTaskScheduler.java | 89 -------------- .../autoscaler/rule/RuleTasksDelegator.java | 114 +++++++++++++++++ .../stratos/autoscaler/util/AutoscalerUtil.java | 54 +++----- .../message/receiver/tenant/TenantManager.java | 2 +- .../receiver/topology/TopologyManager.java | 2 +- .../rest/endpoint/services/ServiceUtils.java | 11 +- .../distribution/src/main/conf/mincheck.drl | 6 +- .../distribution/src/main/conf/scaling.drl | 22 ++-- 16 files changed, 242 insertions(+), 285 deletions(-) ----------------------------------------------------------------------
