You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/01/13 06:08:42 UTC

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

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/0d08123f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0d08123f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0d08123f

Branch: refs/heads/master
Commit: 0d08123fb419f67c55c90c42a9279991c81486b7
Parents: 01060f5 27fb367
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sat Jan 11 19:21:49 2014 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Sat Jan 11 19:21:49 2014 -0500

----------------------------------------------------------------------
 .../stratos/autoscaler/PartitionContext.java    |   2 +-
 .../autoscaler/rule/RuleTasksDelegator.java     |   2 -
 .../distribution/src/main/conf/scaling.drl      | 173 +++++++------------
 3 files changed, 66 insertions(+), 111 deletions(-)
----------------------------------------------------------------------