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/4851b4f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4851b4f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4851b4f4 Branch: refs/heads/master Commit: 4851b4f46fa3fa1e91048688032740f22f8ad8fa Parents: 990ce0b 5c59641 Author: rekathiru <[email protected]> Authored: Fri Feb 21 14:43:48 2014 +0530 Committer: rekathiru <[email protected]> Committed: Fri Feb 21 14:43:48 2014 +0530 ---------------------------------------------------------------------- .../publisher/HealthStatisticsReader.java | 22 ++++- .../stratos/cli/RestCommandLineService.java | 84 ++++++++++++++++++++ .../apache/stratos/cli/StratosApplication.java | 3 + .../stratos/cli/beans/TenantInfoBean.java | 28 +++++++ .../stratos/cli/commands/ListAllTenants.java | 65 +++++++++++++++ .../stratos/cli/commands/PartitionCommand.java | 1 - .../apache/stratos/cli/utils/CliConstants.java | 5 ++ .../manager/client/AutoscalerServiceClient.java | 4 + .../rest/endpoint/services/ServiceUtils.java | 2 +- .../main/autoscale-policies/economyPolicy.xml | 20 ++--- .../distribution/src/main/conf/log4j.properties | 17 ++-- 11 files changed, 227 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
