Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/57cccfbf Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/57cccfbf Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/57cccfbf Branch: refs/heads/master Commit: 57cccfbf83c3c3b7a322cd6b3124a74eae08ce29 Parents: 56434a8 7186d6d Author: Imesh Gunaratne <[email protected]> Authored: Sun Dec 8 14:23:54 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Sun Dec 8 14:23:54 2013 +0530 ---------------------------------------------------------------------- .../client/CloudControllerServiceClient.java | 3 +- .../manager/CartridgeSubscriptionManager.java | 19 +++++++------ .../adc/mgt/payload/NonCarbonPayload.java | 13 ++++----- .../DatabaseBasedPersistenceManager.java | 13 ++++----- .../service/ApplicationManagementService.java | 2 +- .../ApplicationCartridgeSubscription.java | 9 +++--- .../mgt/subscription/CartridgeSubscription.java | 29 +++++++++++++------- .../subscription/CartridgeSubscription_old.java | 8 +++--- .../subscription/DataCartridgeSubscription.java | 13 +++++---- .../DataCartridgeSubscription_old.java | 4 +-- .../FrameworkCartridgeSubscription.java | 9 +++--- .../MultiTenantCartridgeSubscription.java | 2 +- .../SingleTenantCartridgeSubscription.java | 2 +- .../SubscriptionSingleTenantBehaviour.java | 2 ++ .../mgt/utils/ApplicationManagementUtil.java | 10 ++++--- .../cloud/controller/pojo/Registrant.java | 10 ++++++- .../rest/endpoint/bean/CartridgeInfoBean.java | 19 +++++++++---- .../rest/endpoint/services/ServiceUtils.java | 4 +-- .../rest/endpoint/services/StratosAdmin.java | 3 +- .../main/resources/CloudControllerService.wsdl | 13 +++++---- 20 files changed, 109 insertions(+), 78 deletions(-) ----------------------------------------------------------------------
