You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by pr...@apache.org on 2013/12/17 13:05:38 UTC
[18/18] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/214bf85a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/214bf85a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/214bf85a
Branch: refs/heads/master
Commit: 214bf85a0a514e3f7e815294a648ef857b62452c
Parents: 80772d1 d6610d5
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Tue Dec 17 17:32:57 2013 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Tue Dec 17 17:32:57 2013 +0530
----------------------------------------------------------------------
.../service/ServiceDeploymentManager.java | 2 +
.../manager/CartridgeSubscriptionManager.java | 3 +
.../adc/mgt/payload/BasicPayloadData.java | 37 ++-
.../stratos/adc/mgt/payload/PayloadData.java | 18 +-
.../apache/stratos/autoscaler/Constants.java | 15 +-
.../health/HealthEventMessageDelegator.java | 25 +-
.../stratos/cli/RestCommandLineService.java | 1 -
.../HealthStatisticsEventBuilder.xml | 10 -
.../InstanceStatusStatisticsBuilder.xml | 10 -
.../LoadBalancerStatisticsEventBuilder.xml | 10 -
.../AverageInFlightRequestsEventFormatter.xml | 11 -
.../AverageLoadAverageEventFormatter.xml | 11 -
.../AverageMemoryConsumptionEventFormatter.xml | 11 -
.../FaultMessageEventFormatter.xml | 11 -
.../GradientInFlightRequestsEventFormatter.xml | 11 -
.../GradientLoadAverageEventFormatter.xml | 11 -
.../GradientMemoryConsumptionEventFormatter.xml | 11 -
...DerivativeInFlightRequestsEventFormatter.xml | 11 -
...econdDerivativeLoadAverageEventFormatter.xml | 11 -
...erivativeMemoryConsumptionEventFormatter.xml | 11 -
.../HealthStatisticsEventBuilder.xml | 10 +
.../InstanceStatusStatisticsBuilder.xml | 10 +
.../LoadBalancerStatisticsEventBuilder.xml | 10 +
.../AverageInFlightRequestsEventFormatter.xml | 11 +
.../AverageLoadAverageEventFormatter.xml | 11 +
.../AverageMemoryConsumptionEventFormatter.xml | 11 +
.../FaultMessageEventFormatter.xml | 11 +
.../GradientInFlightRequestsEventFormatter.xml | 11 +
.../GradientLoadAverageEventFormatter.xml | 11 +
.../GradientMemoryConsumptionEventFormatter.xml | 11 +
.../MemberAverageLoadAverageEventFormatter.xml | 11 +
...erAverageMemoryConsumptionEventFormatter.xml | 11 +
.../MemberGradientLoadAverageEventFormatter.xml | 11 +
...rGradientMemoryConsumptionEventFormatter.xml | 11 +
...econdDerivativeLoadAverageEventFormatter.xml | 11 +
...erivativeMemoryConsumptionEventFormatter.xml | 11 +
...DerivativeInFlightRequestsEventFormatter.xml | 11 +
...econdDerivativeLoadAverageEventFormatter.xml | 11 +
...erivativeMemoryConsumptionEventFormatter.xml | 11 +
.../execution-plans/AverageHeathRequest.xml | 23 --
.../AverageInFlightRequestsFinder.xml | 19 --
.../execution-plans/GradientOfHealthRequest.xml | 21 --
.../GradientOfRequestsInFlightFinder.xml | 18 --
.../SecondDerivativeOfHealthRequest.xml | 21 --
...SecondDerivativeOfRequestsInFlightFinder.xml | 19 --
.../executionplans/AverageHeathRequest.xml | 29 ++
.../AverageInFlightRequestsFinder.xml | 19 ++
.../executionplans/GradientOfHealthRequest.xml | 30 +++
.../GradientOfRequestsInFlightFinder.xml | 18 ++
.../SecondDerivativeOfHealthRequest.xml | 27 ++
...SecondDerivativeOfRequestsInFlightFinder.xml | 19 ++
.../DefaultWSO2EventInputAdaptor.xml | 3 -
.../DefaultWSO2EventInputAdaptor.xml | 3 +
.../DefaultWSO2EventOutputAdaptor.xml | 8 -
.../output-event-adaptors/JMSOutputAdaptor.xml | 8 -
.../DefaultWSO2EventOutputAdaptor.xml | 8 +
.../outputeventadaptors/JMSOutputAdaptor.xml | 8 +
.../stream-manager-config.xml | 175 ------------
.../streamdefinitions/stream-manager-config.xml | 269 +++++++++++++++++++
.../src/main/bin/health-publisher.sh | 2 +-
.../agent/health/publisher/HealthPublisher.java | 8 +-
.../pom.xml | 2 -
tools/stratos-installer/conf/setup.conf | 14 +-
.../repository/conf/cartridge-config.properties | 8 +-
tools/stratos-installer/setup.sh | 84 +-----
tools/stratos-installer/start-servers.sh | 19 +-
66 files changed, 748 insertions(+), 581 deletions(-)
----------------------------------------------------------------------