Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into data_cartridge
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/87f8d5d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/87f8d5d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/87f8d5d5 Branch: refs/heads/master Commit: 87f8d5d516aa3e4554461a367083cb91dc3ea8af Parents: e54aaa9 9960fae Author: Isuru <[email protected]> Authored: Fri Jan 17 21:05:49 2014 +0530 Committer: Isuru <[email protected]> Committed: Fri Jan 17 21:05:49 2014 +0530 ---------------------------------------------------------------------- .../impl/CloudControllerServiceImpl.java | 48 +++--- .../controllers/cartridgeSubscribeSubmit.jag | 32 ++++ .../console/subscribe_cartridge.jag | 12 +- .../themes/theme1/partials/cartridges.hbs | 2 +- .../theme1/partials/subscribe_cartridge.hbs | 165 ++++++++++--------- .../themes/theme1/renderers/cartridges.js | 2 - .../theme1/renderers/subscribe_cartridge.js | 5 +- .../console/util/utility.jag | 20 ++- .../manager/CartridgeSubscriptionManager.java | 15 +- 9 files changed, 183 insertions(+), 118 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/87f8d5d5/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java ----------------------------------------------------------------------
