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/654db15d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/654db15d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/654db15d Branch: refs/heads/master Commit: 654db15d08dde28ac7d694f40f50d2b5fc81623d Parents: 0f84a48 6c13123 Author: rekathiru <[email protected]> Authored: Thu Feb 13 21:57:08 2014 +0530 Committer: rekathiru <[email protected]> Committed: Thu Feb 13 21:57:08 2014 +0530 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 73 +++++++------ .../manager/CartridgeSubscriptionManager.java | 2 +- .../rest/endpoint/bean/CartridgeInfoBean.java | 38 +++++-- .../rest/endpoint/services/ServiceUtils.java | 89 ++++++++++------ .../rest/endpoint/services/StratosAdmin.java | 103 +++++++++++++------ 5 files changed, 203 insertions(+), 102 deletions(-) ----------------------------------------------------------------------
