You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/08/21 07:34:21 UTC
[2/6] stratos git commit: Merge branch 'tenant-isolation' of
https://github.com/apache/stratos into tenant-isolation-v1
Merge branch 'tenant-isolation' of https://github.com/apache/stratos into tenant-isolation-v1
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b228f115
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b228f115
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b228f115
Branch: refs/heads/tenant-isolation
Commit: b228f115576337dd48d027f68ae34b7e178bd0f4
Parents: e873b94 7575faa
Author: Dinithi <di...@wso2.com>
Authored: Thu Aug 20 12:34:51 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Thu Aug 20 12:34:51 2015 +0530
----------------------------------------------------------------------
.../client/AutoscalerCloudControllerClient.java | 16 +-
.../autoscaler/rule/RuleTasksDelegator.java | 48 +-
.../publisher/HealthStatisticsNotifier.java | 10 +-
.../messaging/topology/TopologyBuilder.java | 1434 +++++++++---------
.../impl/CloudControllerServiceImpl.java | 6 +-
.../impl/CloudControllerServiceUtil.java | 15 +-
.../services/impl/InstanceCreator.java | 17 +-
.../publisher/BAMUsageDataPublisher.java | 44 +-
.../util/CloudControllerConstants.java | 4 +
.../common/constants/StratosConstants.java | 8 +-
.../publisher/HealthStatisticsPublisher.java | 3 +-
.../publisher/InFlightRequestPublisher.java | 4 +-
.../publisher/StatisticsPublisherType.java | 2 +-
.../publisher/ThriftClientConfig.java | 81 +
.../publisher/ThriftClientConfigParser.java | 139 ++
.../statistics/publisher/ThriftClientInfo.java | 63 +
.../publisher/ThriftStatisticsPublisher.java | 115 ++
.../publisher/wso2/cep/ThriftClientConfig.java | 81 -
.../wso2/cep/ThriftClientConfigParser.java | 139 --
.../publisher/wso2/cep/ThriftClientInfo.java | 63 -
.../cep/WSO2CEPHealthStatisticsPublisher.java | 29 +-
.../cep/WSO2CEPInFlightRequestPublisher.java | 28 +-
.../wso2/cep/WSO2CEPStatisticsPublisher.java | 114 --
.../test/ThriftClientConfigParserTest.java | 13 +-
.../LoadBalancerStatisticsNotifier.java | 3 +-
.../publisher/MockHealthStatisticsNotifier.java | 3 +
.../modules/healthstatspublisher/healthstats.py | 7 +-
.../HealthStatsEventFormatter.xml | 30 +
.../eventformatters/RIFEventFormatter.xml | 31 +
.../DASDefaultWSO2EventOutputAdaptor.xml | 29 +
.../streamdefinitions/stream-manager-config.xml | 486 +++---
extensions/das/README.md | 10 +
.../CloudControllerEventReceiver.xml | 29 +
.../eventreceivers/HealthStatsEventReceiver.xml | 29 +
.../eventreceivers/RIFEventReceiver.xml | 29 +
.../eventsink/cartridge_agent_health_stats.xml | 85 ++
.../artifacts/eventsink/in_flight_requests.xml | 64 +
.../org_apache_stratos_cloud_controller.xml | 211 +++
.../cartridge_agent_health_stats_1.0.0.json | 40 +
.../eventstreams/in_flight_requests_1.0.0.json | 28 +
...g.apache.stratos.cloud.controller_1.0.0.json | 112 ++
extensions/das/artifacts/sparkscript/CCEvent | 18 +
extensions/das/pom.xml | 40 +
extensions/das/spark-udf/pom.xml | 36 +
.../das/extension/spark/udf/TimeUDF.java | 49 +
extensions/pom.xml | 4 +-
.../src/main/conf/drools/dependent-scaling.drl | 4 +-
.../src/main/conf/drools/mincheck.drl | 5 +-
.../src/main/conf/drools/scaling.drl | 7 +-
49 files changed, 2441 insertions(+), 1424 deletions(-)
----------------------------------------------------------------------