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/2fbefde9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2fbefde9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2fbefde9 Branch: refs/heads/master Commit: 2fbefde9472fc9e057091036bee27c46f0ebcfda Parents: 3ecb7c6 757f7bf Author: Manula Thantriwatte <[email protected]> Authored: Wed Nov 27 09:20:14 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Wed Nov 27 09:20:14 2013 +0530 ---------------------------------------------------------------------- .../stratos/adc/mgt/dto/SubscriptionInfo.java | 2 + .../stratos/autoscaler/ClusterContext.java | 9 +- .../rule/AutoscalerRuleEvaluator.java | 3 +- .../src/main/resources/autoscaler.drl | 114 ------------------- .../impl/CloudControllerServiceImpl.java | 30 ++--- .../distribution/src/main/conf/autoscaler.drl | 32 +++--- 6 files changed, 36 insertions(+), 154 deletions(-) ----------------------------------------------------------------------
