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/41e5f697 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/41e5f697 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/41e5f697 Branch: refs/heads/master Commit: 41e5f6975d9b19f43e2bd3d0ab24afd810c59017 Parents: c865b29 fddb157 Author: Manula Thantriwatte <[email protected]> Authored: Thu Dec 12 16:23:26 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Thu Dec 12 16:23:26 2013 +0530 ---------------------------------------------------------------------- .../event-formatters/AverageLoadAverageEventFormatter.xml | 2 +- .../AverageMemoryConsumptionEventFormatter.xml | 2 +- .../event-formatters/FaultMessageEventFormatter.xml | 2 +- .../GradientLoadAverageEventFormatter.xml | 2 +- .../GradientMemoryConsumptionEventFormatter.xml | 2 +- .../SecondDerivativeLoadAverageEventFormatter.xml | 2 +- .../SecondDerivativeMemoryConsumptionEventFormatter.xml | 2 +- .../cep/artifacts/execution-plans/AverageHeathRequest.xml | 6 +++--- .../artifacts/execution-plans/GradientOfHealthRequest.xml | 6 ++---- .../execution-plans/SecondDerivativeOfHealthRequest.xml | 4 ++-- .../stream-definitions/stream-manager-config.xml | 6 ------ .../cartridge/agent/health/publisher/HealthPublisher.java | 10 +++++----- 12 files changed, 19 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
