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/99fdf344
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/99fdf344
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/99fdf344

Branch: refs/heads/master
Commit: 99fdf344643993dc626c6b075591d154def51531
Parents: 754220f da39104
Author: Imesh Gunaratne <[email protected]>
Authored: Mon Nov 25 19:25:47 2013 +0530
Committer: Imesh Gunaratne <[email protected]>
Committed: Mon Nov 25 19:25:47 2013 +0530

----------------------------------------------------------------------
 .../HealthStatisticsEventBuilder.xml            | 10 ++++++++
 .../AverageLoadAverageEventFormatter.xml        | 11 +++++++++
 .../AverageMemoryConsumptionEventFormatter.xml  | 11 +++++++++
 .../FaultMessageEventFormatter.xml              | 11 +++++++++
 .../GradientLoadAverageEventFormatter.xml       | 11 +++++++++
 .../GradientMemoryConsumptionEventFormatter.xml | 11 +++++++++
 ...econdDerivativeLoadAverageEventFormatter.xml | 11 +++++++++
 ...erivativeMemoryConsumptionEventFormatter.xml | 11 +++++++++
 .../executionplans/AverageHeathRequest.xml      | 21 +++++++++++++++++
 .../executionplans/GradientOfHealthRequest.xml  | 24 ++++++++++++++++++++
 .../SecondDerivativeOfHealthRequest.xml         | 21 +++++++++++++++++
 .../src/main/bin/event-subscriber.sh            |  4 ++--
 12 files changed, 155 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


Reply via email to