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/2bc47a0d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2bc47a0d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2bc47a0d Branch: refs/heads/master Commit: 2bc47a0d6c45083297996e0dcb15620510c23acf Parents: 6612cb9 258ebf0 Author: Udara Liyanage <[email protected]> Authored: Wed Dec 18 14:41:21 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Wed Dec 18 14:41:21 2013 -0500 ---------------------------------------------------------------------- .../manager/CartridgeSubscriptionManager.java | 9 ++++- .../service/ApplicationManagementService.java | 35 ++---------------- .../utils/CartridgeSubscriptionUtils.java | 34 ++++++++++++++++++ .../balancer/LoadBalancerTenantReceiver.java | 37 +++++++++++++++++--- .../TopologyFilterConfigurator.java | 9 +++++ .../internal/LoadBalancerServiceComponent.java | 11 ++++++ 6 files changed, 98 insertions(+), 37 deletions(-) ----------------------------------------------------------------------
