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/4a2d616f Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4a2d616f Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4a2d616f Branch: refs/heads/master Commit: 4a2d616ff963e76655f701a36ebef50aaa71cbac Parents: bf9d67c 1aded30 Author: reka <[email protected]> Authored: Mon Jan 13 13:52:11 2014 +0530 Committer: reka <[email protected]> Committed: Mon Jan 13 13:52:11 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/algorithm/OneAfterAnother.java | 23 +- .../autoscaler/algorithm/RoundRobin.java | 16 +- .../health/AutoscalerHealthStatReceiver.java | 496 +++---------------- .../autoscaler/rule/RuleTasksDelegator.java | 3 - .../distribution/src/main/conf/scaling.drl | 7 +- 5 files changed, 78 insertions(+), 467 deletions(-) ----------------------------------------------------------------------
