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/029cca0e Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/029cca0e Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/029cca0e Branch: refs/heads/master Commit: 029cca0e30b66d84f345594f8a8ced548d6ea149 Parents: ede099b c6df231 Author: Isuru <[email protected]> Authored: Fri Feb 14 16:05:55 2014 +0530 Committer: Isuru <[email protected]> Committed: Fri Feb 14 16:05:55 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/PartitionContext.java | 17 +++++++ .../topology/AutoscalerTopologyReceiver.java | 20 ++++++-- .../controllers/cartridgeSubscribeSubmit.jag | 10 ++++ .../theme1/partials/subscribe_cartridge.hbs | 46 ++++++++++++++++--- .../theme1/renderers/configure_stratos.js | 7 --- .../renderers/configure_stratos_wizard.js | 48 ++++++++++++++------ .../console/themes/theme1/renderers/index.js | 1 + .../theme1/renderers/subscribe_cartridge.js | 3 -- .../console/util/utility.jag | 6 +-- .../apache/stratos/manager/dto/Cartridge.java | 10 ++++ .../rest/endpoint/services/ServiceUtils.java | 3 ++ .../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 2 +- 12 files changed, 134 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/029cca0e/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ----------------------------------------------------------------------
