Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into rest_api_return_object
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a46827c9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a46827c9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a46827c9 Branch: refs/heads/master Commit: a46827c9221273153132ae5a158f10ce46cc8889 Parents: 62a6af1 62d9e97 Author: Isuru <[email protected]> Authored: Thu Feb 13 19:47:56 2014 +0530 Committer: Isuru <[email protected]> Committed: Thu Feb 13 19:47:56 2014 +0530 ---------------------------------------------------------------------- .../apache/stratos/cli/GenericRestClient.java | 2 +- .../java/org/apache/stratos/cli/RestClient.java | 7 +- .../stratos/cli/RestCommandLineService.java | 211 +++++++++++-------- .../controllers/cartridgeDefintionSubmit.jag | 5 + .../console/controllers/wizardSubmit.jag | 9 +- .../console/themes/theme1/partials/header.hbs | 28 ++- .../theme1/renderers/configure_stratos.js | 27 ++- .../renderers/configure_stratos_wizard.js | 26 ++- .../console/themes/theme1/ui/css/main.css | 4 + .../console/util/utility.jag | 46 ++-- 10 files changed, 244 insertions(+), 121 deletions(-) ----------------------------------------------------------------------
