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/ad210e42 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ad210e42 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ad210e42 Branch: refs/heads/master Commit: ad210e4221ec54ee19772ab091fdfabe69a8c409 Parents: d1bfb46 f803d82 Author: Udara Liyanage <[email protected]> Authored: Wed Dec 18 11:30:46 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Wed Dec 18 11:30:46 2013 -0500 ---------------------------------------------------------------------- .../adc/mgt/payload/BasicPayloadData.java | 4 +- .../StratosManagerTopologyReceiver.java | 15 +++++ .../cloud/controller/CloudControllerClient.java | 3 + .../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 ++- 9 files changed, 177 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
