Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into lb_subscription_refactoring
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ff3afed8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ff3afed8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ff3afed8 Branch: refs/heads/master Commit: ff3afed8569836b3663f622b4a5f368b4c88109e Parents: e6a66b1 27fb367 Author: Isuru <[email protected]> Authored: Sun Jan 12 10:16:50 2014 +0530 Committer: Isuru <[email protected]> Committed: Sun Jan 12 10:16:50 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/PartitionContext.java | 2 +- .../autoscaler/rule/RuleTasksDelegator.java | 2 - .../controllers/cartridgeDefintionSubmit.jag | 8 + .../theme1/partials/cartridge_deployments.hbs | 21 ++- .../console/util/utility.jag | 4 + .../distribution/src/main/conf/scaling.drl | 173 +++++++------------ 6 files changed, 90 insertions(+), 120 deletions(-) ----------------------------------------------------------------------
