You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/12/12 11:11:35 UTC
[33/50] 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/043cdce5
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/043cdce5
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/043cdce5
Branch: refs/heads/master
Commit: 043cdce57703b0eea5721e3da717ac345ef2cad5
Parents: f7bc8a3 71605eb
Author: reka <rt...@gmail.com>
Authored: Thu Dec 11 22:59:08 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu Dec 11 22:59:08 2014 +0530
----------------------------------------------------------------------
.../context/cluster/ClusterInstanceContext.java | 10 ++
.../parser/CloudControllerConfigParser.java | 21 ++-
.../iaases/mock/MockAutoscalingFactor.java | 27 ++++
.../iaases/mock/MockIPAddressPool.java | 1 +
.../controller/iaases/mock/MockIaasService.java | 19 ++-
.../controller/iaases/mock/MockMember.java | 4 +-
.../mock/config/MockHealthStatisticsConfig.java | 44 ++++++
.../iaases/mock/config/MockIaasConfig.java | 65 ++++++++
.../mock/config/MockIaasConfigParser.java | 147 +++++++++++++++++++
.../mock/statistics/MockHealthStatistics.java | 117 +++++++++++++++
.../MockHealthStatisticsNotifier.java | 86 -----------
.../MockHealthStatisticsPublisher.java | 91 ------------
.../MockHealthStatisticsGenerator.java | 72 +++++++++
.../generator/MockHealthStatisticsPattern.java | 77 ++++++++++
.../generator/MockHealthStatisticsUpdater.java | 57 +++++++
.../publisher/MockHealthStatisticsNotifier.java | 97 ++++++++++++
.../MockHealthStatisticsPublisher.java | 91 ++++++++++++
.../CloudControllerServiceComponent.java | 7 +-
.../main/resources/conf/cloud-controller.xml | 32 ++--
.../modules/distribution/src/assembly/bin.xml | 36 +++--
.../src/main/conf/drools/scaling.drl | 2 +-
.../distribution/src/main/conf/mock-iaas.xml | 37 +++++
22 files changed, 907 insertions(+), 233 deletions(-)
----------------------------------------------------------------------