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/69bad7ce Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/69bad7ce Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/69bad7ce Branch: refs/heads/master Commit: 69bad7ce33734e51b561d2640ec6d7f5435578d9 Parents: e05aff0 00524c6 Author: Lahiru Sandaruwan <[email protected]> Authored: Tue Dec 17 23:21:32 2013 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue Dec 17 23:21:32 2013 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/AutoscalerContext.java | 1 + .../autoscaler/policy/PolicyManager.java | 4 +- .../stratos/cli/RestCommandLineService.java | 78 +++++++++++++++++--- .../apache/stratos/cli/utils/CliConstants.java | 1 + .../pom.xml | 4 +- .../src/main/conf/cartridge-config.properties | 10 +-- 6 files changed, 78 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
