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/01006fc0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/01006fc0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/01006fc0 Branch: refs/heads/master Commit: 01006fc074f0df1fb2aa33befa56b69d4e335dc9 Parents: f7234c8 029958d Author: Pradeep Fernando <[email protected]> Authored: Sun Jan 12 14:17:14 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Sun Jan 12 14:17:14 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/PartitionContext.java | 2 +- .../autoscaler/rule/RuleTasksDelegator.java | 2 - .../stratos/manager/deploy/service/Service.java | 13 +- .../service/ServiceDeploymentManager.java | 11 ++ .../manager/lookup/LookupDataHolder.java | 23 +++ .../lookup/TenantIdToSubscriptionContext.java | 6 + .../DataInsertionAndRetrievalManager.java | 14 ++ .../InstanceNotifierMessageProcessorChain.java | 3 + .../rest/endpoint/services/ServiceUtils.java | 14 ++ .../distribution/src/main/conf/scaling.drl | 173 +++++++------------ 10 files changed, 149 insertions(+), 112 deletions(-) ----------------------------------------------------------------------
