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/110b38ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/110b38ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/110b38ac Branch: refs/heads/master Commit: 110b38ac176b55d1731da689ffd2d099c1709762 Parents: 116d486 a1e7acb Author: Udara Liyanage <[email protected]> Authored: Wed Feb 12 11:53:35 2014 -0500 Committer: Udara Liyanage <[email protected]> Committed: Wed Feb 12 11:53:35 2014 -0500 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 56 +++++++++++++++- .../apache/stratos/cli/StratosApplication.java | 6 ++ .../cli/commands/ActivateTenantCommand.java | 70 ++++++++++++++++++++ .../cli/commands/DeactivateTenantCommand.java | 70 ++++++++++++++++++++ .../apache/stratos/cli/utils/CliConstants.java | 8 +++ .../stratos/manager/deploy/service/Service.java | 7 +- .../SubscriptionSingleTenantBehaviour.java | 12 +++- .../utils/CartridgeSubscriptionUtils.java | 5 ++ .../distribution/src/main/conf/autoscaler.xml | 3 + 9 files changed, 232 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
