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/42169a4f Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/42169a4f Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/42169a4f Branch: refs/heads/master Commit: 42169a4f3a4349f2a8ef9fed30d3bf5470358866 Parents: be012a0 fa377af Author: rekathiru <[email protected]> Authored: Tue Feb 11 15:40:54 2014 +0530 Committer: rekathiru <[email protected]> Committed: Tue Feb 11 15:40:54 2014 +0530 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 32 ++++++++++++++++++-- .../stratos/cli/beans/cartridge/Cartridge.java | 9 ++++++ 2 files changed, 38 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
