Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8105f276 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8105f276 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8105f276 Branch: refs/heads/master Commit: 8105f276eb171ba630cfb55be2540652a05cdff8 Parents: 6994011 d77e161 Author: R-Rajkumar <[email protected]> Authored: Mon Oct 13 15:13:15 2014 +0530 Committer: R-Rajkumar <[email protected]> Committed: Mon Oct 13 15:13:15 2014 +0530 ---------------------------------------------------------------------- .../java/org/apache/stratos/cli/RestClient.java | 34 +------ .../stratos/cli/RestCommandLineService.java | 99 ++++++++++---------- .../autoscaler/partition/PropertyBean.java | 6 ++ .../stratos/cli/beans/topology/Cluster.java | 14 +++ .../stratos/cli/beans/topology/Member.java | 19 +++- .../org/apache/stratos/cli/utils/CliUtils.java | 63 ++++++++++--- .../impl/CloudControllerServiceImpl.java | 3 +- .../topology/TopologyEventPublisher.java | 4 +- .../model/TopologyClusterInformationModel.java | 2 +- .../messaging/domain/topology/Cluster.java | 17 ++-- .../messaging/domain/topology/Member.java | 8 ++ .../InstanceSpawnedMessageProcessor.java | 5 +- .../rest/endpoint/bean/topology/Cluster.java | 21 +++-- .../rest/endpoint/bean/topology/Member.java | 17 +++- .../bean/util/converter/PojoConverter.java | 23 ++++- .../distribution/src/main/conf/autoscaler.xml | 2 +- 16 files changed, 214 insertions(+), 123 deletions(-) ----------------------------------------------------------------------
