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/548537d9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/548537d9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/548537d9 Branch: refs/heads/master Commit: 548537d9381d315fb83d5a9ea2ec8a6df11b1bbc Parents: b15c699 a627251 Author: Nirmal Fernando <[email protected]> Authored: Tue Feb 25 17:59:29 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Tue Feb 25 17:59:29 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/pojo/Cartridge.java | 10 ++ .../controller/util/CloudControllerUtil.java | 2 + .../console/cartridge_info.jag | 2 - .../console/controllers/acs.jag | 6 +- .../console/controllers/loginSubmit.jag | 3 - .../console/controllers/manageTenants.jag | 5 +- .../console/controllers/profileClient.jag | 3 +- .../console/tenant_new.jag | 2 +- .../partials/configure_stratos_wizard.hbs | 2 +- .../themes/theme1/partials/mycartridges.hbs | 2 +- .../theme1/partials/subscribe_cartridge.hbs | 116 +++++++++++-------- .../themes/theme1/partials/tenant_new.hbs | 8 +- .../console/themes/theme1/renderers/login.js | 2 - .../console/themes/theme1/ui/css/main.css | 5 +- .../console/themes/theme1/ui/js/mycartridges.js | 2 +- .../console/themes/theme1/ui/js/popup.js | 1 + .../console/util/utility.jag | 43 ++++++- 17 files changed, 140 insertions(+), 74 deletions(-) ----------------------------------------------------------------------
