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/47a5f65b Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/47a5f65b Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/47a5f65b Branch: refs/heads/master Commit: 47a5f65bac766448b8bee73671472b4f570b18e1 Parents: 53924a9 c481e02 Author: Udara Liyanage <[email protected]> Authored: Wed Dec 18 15:36:41 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Wed Dec 18 15:36:41 2013 -0500 ---------------------------------------------------------------------- .../autoscaler/TestObsoletedMemberRule.java | 7 +- .../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/StratosApplication.java | 7 +- .../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 ++++++++ .../conf/configurator/SynapseConfigurator.java | 6 +- .../TopologyFilterConfigurator.java | 26 ++- .../internal/LoadBalancerServiceComponent.java | 4 + 22 files changed, 685 insertions(+), 676 deletions(-) ----------------------------------------------------------------------
