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/2781d999 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2781d999 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2781d999 Branch: refs/heads/master Commit: 2781d999cdca663a32a451300d7029499f65000a Parents: d765dca 3ff07ad Author: Udara Liyanage <[email protected]> Authored: Tue Feb 11 01:39:12 2014 -0500 Committer: Udara Liyanage <[email protected]> Committed: Tue Feb 11 01:39:12 2014 -0500 ---------------------------------------------------------------------- .../apache/stratos/manager/dto/Cartridge.java | 16 ++++++-- .../manager/CartridgeSubscriptionManager.java | 10 +++-- .../service/ApplicationManagementService.java | 2 +- .../subscription/CartridgeSubscription.java | 9 +++++ .../rest/endpoint/services/ServiceUtils.java | 39 ++++++++++++++++---- .../rest/endpoint/services/StratosAdmin.java | 10 +++++ 6 files changed, 71 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
