You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/12/10 10:35:53 UTC
[2/2] stratos git commit: Merge branch '4.1.0-test' of
https://git-wip-us.apache.org/repos/asf/stratos into 4.1.0-test
Merge branch '4.1.0-test' of https://git-wip-us.apache.org/repos/asf/stratos into 4.1.0-test
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0844105c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0844105c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0844105c
Branch: refs/heads/4.1.0-test
Commit: 0844105cd26cf44acdd2c517ec6ee3662b7b5ebd
Parents: d9c65bd aeb4458
Author: reka <rt...@gmail.com>
Authored: Wed Dec 10 15:05:19 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Wed Dec 10 15:05:19 2014 +0530
----------------------------------------------------------------------
.../autoscaler/rule/RuleTasksDelegator.java | 33 +--
.../cloud/controller/iaases/JcloudsIaas.java | 79 +++++--
.../controller/iaases/mock/MockIaasService.java | 5 -
.../CartridgeInstanceDataPublisher.java | 214 -------------------
.../publisher/StatisticsDataPublisher.java | 212 ++++++++++++++++++
.../messaging/topology/TopologyBuilder.java | 54 ++---
.../impl/CloudControllerServiceImpl.java | 95 ++++----
.../impl/CloudControllerServiceUtil.java | 99 +--------
.../services/impl/InstanceCreator.java | 12 +-
.../services/impl/InstanceTerminator.java | 4 +
.../src/main/conf/drools/scaling.drl | 10 +-
11 files changed, 368 insertions(+), 449 deletions(-)
----------------------------------------------------------------------