Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/10d5257b Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/10d5257b Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/10d5257b Branch: refs/heads/master Commit: 10d5257bfa2de0580b492399a4cdde4af3d7630a Parents: 947b02e 3b03ba9 Author: anuruddhal <[email protected]> Authored: Wed May 20 19:57:01 2015 +0530 Committer: anuruddhal <[email protected]> Committed: Wed May 20 19:57:01 2015 +0530 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 14 +- .../console/configure_form.jag | 6 + .../default/configure/kubernetes-clusters.json | 22 +- .../forms/schema/configure/cartridges.json | 340 ++++-------------- .../schema/configure/kubernetes-clusters.json | 347 +++++-------------- .../console/controllers/menu/menu.json | 2 +- .../theme0/partials/applications_form.hbs | 2 +- .../themes/theme0/partials/configure_form.hbs | 10 +- .../src/main/webapp/api/WEB-INF/cxf-servlet.xml | 3 +- 9 files changed, 176 insertions(+), 570 deletions(-) ----------------------------------------------------------------------
