Merge branch 'm_cli2' of https://github.com/shirolk/stratos
This closes #66 Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9ea2e1d0 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9ea2e1d0 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9ea2e1d0 Branch: refs/heads/master Commit: 9ea2e1d0d30eb8db4965711731be8271d944b159 Parents: bbf34f7 79507d4 Author: Manula Thantriwatte <[email protected]> Authored: Fri Sep 26 17:02:56 2014 +0000 Committer: Manula Thantriwatte <[email protected]> Committed: Fri Sep 26 17:02:56 2014 +0000 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 46 ++++++++++++-------- .../beans/autoscaler/partition/Partition.java | 20 +++++++++ .../policy/autoscale/AutoscalePolicy.java | 13 +++++- .../policy/deployment/DeploymentPolicy.java | 22 +++++++++- .../stratos/cli/beans/cartridge/Cartridge.java | 9 ++++ .../beans/cartridge/ServiceDefinitionBean.java | 9 ++++ 6 files changed, 97 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
