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/32a905ec Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/32a905ec Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/32a905ec Branch: refs/heads/master Commit: 32a905ecc0c25196039823abc60ce2287fd169e8 Parents: 139b1b3 41e5f69 Author: Imesh Gunaratne <[email protected]> Authored: Thu Dec 12 17:37:32 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Dec 12 17:37:32 2013 +0530 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 15 ++++- .../controller/util/CloudControllerUtil.java | 5 +- .../AverageLoadAverageEventFormatter.xml | 2 +- .../AverageMemoryConsumptionEventFormatter.xml | 2 +- .../FaultMessageEventFormatter.xml | 2 +- .../GradientLoadAverageEventFormatter.xml | 2 +- .../GradientMemoryConsumptionEventFormatter.xml | 2 +- ...econdDerivativeLoadAverageEventFormatter.xml | 2 +- ...erivativeMemoryConsumptionEventFormatter.xml | 2 +- .../execution-plans/AverageHeathRequest.xml | 6 +- .../execution-plans/GradientOfHealthRequest.xml | 6 +- .../SecondDerivativeOfHealthRequest.xml | 4 +- .../stream-manager-config.xml | 6 -- .../pom.xml | 8 +++ .../agent/health/publisher/HealthPublisher.java | 10 +-- .../modules/distribution/src/assembly/bin.xml | 3 +- .../src/main/conf/cartridge-config.properties | 65 ++++++++++++++++++++ 17 files changed, 110 insertions(+), 32 deletions(-) ----------------------------------------------------------------------
