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/13998a21 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/13998a21 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/13998a21 Branch: refs/heads/master Commit: 13998a2178b44315730e5242acb45c01b8d3f66a Parents: 6dfacbd a9fcde9 Author: Nirmal Fernando <[email protected]> Authored: Thu Feb 20 19:55:21 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Thu Feb 20 19:55:21 2014 +0530 ---------------------------------------------------------------------- .../controller/validate/AWSEC2PartitionValidator.java | 7 ++++--- .../validate/OpenstackNovaPartitionValidator.java | 7 ++++--- .../console/controllers/cartridgeSubscribeSubmit.jag | 10 ++++++++++ .../themes/theme1/partials/subscribe_cartridge.hbs | 11 ++++++----- .../stratos/rest/endpoint/services/StratosAdmin.java | 2 +- 5 files changed, 25 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
