Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d35d164a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d35d164a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d35d164a Branch: refs/heads/master Commit: d35d164a8242cf5301c2be421279a288622b61c4 Parents: 07fd2ff dc493cc Author: Imesh Gunaratne <[email protected]> Authored: Wed Dec 18 15:00:42 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Dec 18 15:00:42 2013 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/cli/AutoscalePolicy.java | 52 ----- .../java/org/apache/stratos/cli/Cartridge.java | 201 ------------------- .../apache/stratos/cli/CartridgeInfoBean.java | 124 ------------ .../apache/stratos/cli/DeploymentPolicy.java | 31 --- .../java/org/apache/stratos/cli/Partition.java | 76 ------- .../org/apache/stratos/cli/PropertyBean.java | 42 ---- .../stratos/cli/RestCommandLineService.java | 1 + .../apache/stratos/cli/SubscriptionInfo.java | 44 ---- .../org/apache/stratos/cli/TenantInfoBean.java | 85 -------- .../stratos/cli/beans/AutoscalePolicy.java | 52 +++++ .../org/apache/stratos/cli/beans/Cartridge.java | 201 +++++++++++++++++++ .../stratos/cli/beans/CartridgeInfoBean.java | 124 ++++++++++++ .../stratos/cli/beans/DeploymentPolicy.java | 31 +++ .../org/apache/stratos/cli/beans/Partition.java | 76 +++++++ .../apache/stratos/cli/beans/PropertyBean.java | 42 ++++ .../stratos/cli/beans/SubscriptionInfo.java | 44 ++++ .../stratos/cli/beans/TenantInfoBean.java | 85 ++++++++ .../src/main/conf/cartridge-config.properties | 5 +- 18 files changed, 658 insertions(+), 658 deletions(-) ----------------------------------------------------------------------
