Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/0eaf045e Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0eaf045e Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0eaf045e Branch: refs/heads/master Commit: 0eaf045e62d62c8bbf3844a24102aadff75dbc6a Parents: b0480be 910d536 Author: Isuru <[email protected]> Authored: Thu Dec 26 05:40:24 2013 +0530 Committer: Isuru <[email protected]> Committed: Thu Dec 26 05:40:24 2013 +0530 ---------------------------------------------------------------------- .../autoscaler/NetworkPartitionContext.java | 22 +-- .../autoscaler/algorithm/OneAfterAnother.java | 139 ++++++++++--------- .../autoscaler/algorithm/RoundRobin.java | 5 +- .../autoscaler/partition/PartitionManager.java | 4 +- .../rule/AutoscalerRuleEvaluator.java | 2 + .../apache/stratos/autoscaler/rule/RuleLog.java | 55 ++++++++ .../autoscaler/rule/RuleTasksDelegator.java | 9 +- .../stratos/autoscaler/util/AutoscalerUtil.java | 3 +- .../distribution/src/main/conf/mincheck.drl | 13 +- .../distribution/src/main/conf/scaling.drl | 30 ++-- 10 files changed, 178 insertions(+), 104 deletions(-) ----------------------------------------------------------------------
