You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@stratos.apache.org by is...@apache.org on 2014/01/18 19:21:48 UTC

[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into lookup

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into lookup


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6fdb0770
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6fdb0770
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6fdb0770

Branch: refs/heads/master
Commit: 6fdb0770407292f9c974833685c9f6be6110eba0
Parents: b0110aa f7dab5f
Author: Isuru <is...@wso2.com>
Authored: Sat Jan 18 23:50:29 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Sat Jan 18 23:50:29 2014 +0530

----------------------------------------------------------------------
 .../stratos/autoscaler/PartitionContext.java    |  12 +-
 .../autoscaler/algorithm/OneAfterAnother.java   |  16 +-
 .../autoscaler/algorithm/RoundRobin.java        | 159 ++++++++++---------
 .../autoscaler/rule/RuleTasksDelegator.java     |   8 +-
 .../distribution/src/main/conf/scaling.drl      |  18 +--
 5 files changed, 122 insertions(+), 91 deletions(-)
----------------------------------------------------------------------