You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/02 14:08:03 UTC
[2/2] git commit: Merge remote-tracking branch 'origin/master'
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/0fc08337
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0fc08337
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0fc08337
Branch: refs/heads/master
Commit: 0fc0833745e8ed581aff4cd5b425dd572ffe6144
Parents: f17e088 1945514
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Dec 2 18:37:20 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Dec 2 18:37:20 2013 +0530
----------------------------------------------------------------------
.../service/RepositoryInformationService.java | 71 -------
.../src/main/resources/META-INF/services.xml | 19 --
.../algorithm/AutoscaleAlgorithm.java | 32 ++-
.../autoscaler/algorithm/OneAfterAnother.java | 27 ++-
.../PartitionGroupOneAfterAnother.java | 14 +-
.../autoscaler/algorithm/RoundRobin.java | 28 +--
.../autoscaler/api/AutoScalerServiceImpl.java | 17 ++
.../cloud/controller/CloudControllerClient.java | 12 +-
.../interfaces/AutoScalerServiceInterface.java | 3 +
.../processors/AutoscalerTopologyReceiver.java | 5 +
.../stratos/autoscaler/util/AutoscalerUtil.java | 4 +-
.../interfaces/CloudControllerService.java | 2 +-
.../distribution/src/main/assembly/bin.xml | 8 +
.../deployment-policies/economy-deployment.xml | 16 +-
.../src/main/partitions/partitions.xml | 41 ++++
.../src/main/bin/event-subscriber.sh | 2 +-
.../event/subscriber/ArtifactListener.java | 15 +-
.../subscriber/CartridgeAgentConstants.java | 33 ++++
.../cartridge/agent/event/subscriber/Main.java | 7 +-
.../pom.xml | 119 ------------
.../resources/RepositoryInformationService.wsdl | 193 -------------------
service-stubs/pom.xml | 1 -
tools/stratos-installer/conf/setup.conf | 7 +-
tools/stratos-installer/setup.sh | 65 +++++--
tools/stratos-installer/start-servers.sh | 27 +--
25 files changed, 271 insertions(+), 497 deletions(-)
----------------------------------------------------------------------