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/f8dc515c Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f8dc515c Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f8dc515c Branch: refs/heads/master Commit: f8dc515cd86e30ba0f56f857ffc268f8d5d74172 Parents: 2b33e91 8893586 Author: Lahiru Sandaruwan <[email protected]> Authored: Wed Dec 18 11:52:27 2013 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Wed Dec 18 11:52:27 2013 +0530 ---------------------------------------------------------------------- .../adc/mgt/client/AutoscalerServiceClient.java | 13 +++- .../client/CloudControllerServiceClient.java | 9 ++- .../adc/mgt/utils/CartridgeConstants.java | 5 ++ .../autoscaler/policy/PolicyManager.java | 5 +- .../apache/stratos/cli/DeploymentPolicy.java | 31 +++++++++ .../stratos/cli/RestCommandLineService.java | 68 ++++++++++++++++++++ .../apache/stratos/cli/StratosApplication.java | 3 + .../cli/commands/AutoscalePolicyCommand.java | 3 - .../cli/commands/DeploymentPolicyCommand.java | 48 ++++++++++++++ .../apache/stratos/cli/utils/CliConstants.java | 9 ++- 10 files changed, 184 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
