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/14361935 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/14361935 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/14361935 Branch: refs/heads/master Commit: 14361935844b9e999b1d94af1a11ffbdef2c10c7 Parents: 18a1692 6b4a9c2 Author: Lahiru Sandaruwan <[email protected]> Authored: Sun Dec 22 20:28:02 2013 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Sun Dec 22 20:28:02 2013 +0530 ---------------------------------------------------------------------- .../stat/AverageLoadAverageEventListener.java | 7 +- .../AverageMemoryConsumptionEventListener.java | 7 +- .../AverageRequestsInFlightEventListener.java | 7 +- .../GradientOfLoadAverageEventListener.java | 7 +- ...radientOfMemoryConsumptionEventListener.java | 7 +- ...GradientOfRequestsInFlightEventListener.java | 7 +- .../MemberAverageLoadAverageEventListener.java | 7 +- ...erAverageMemoryConsumptionEventListener.java | 7 +- .../health/stat/MemberFaultEventListener.java | 7 +- ...emberGradientOfLoadAverageEventListener.java | 22 +--- ...radientOfMemoryConsumptionEventListener.java | 7 +- ...ondDerivativeOfLoadAverageEventListener.java | 7 +- ...ivativeOfMemoryConsumptionEventListener.java | 7 +- ...ondDerivativeOfLoadAverageEventListener.java | 7 +- ...ivativeOfMemoryConsumptionEventListener.java | 7 +- ...rivativeOfRequestsInFlightEventListener.java | 7 +- .../stat/HealthStatMessageProcessorChain.java | 106 +++++++++++++++++++ .../stat/HealthStatEventMessageDelegator.java | 95 +++++++++++++++++ .../stat/HealthStatEventMessageListener.java | 55 ++++++++++ .../stat/HealthStatEventMessageQueue.java | 26 +++++ .../src/main/bin/cartridge-agent.sh | 4 +- .../modules/scripts/ec2/cartridge-agent.sh | 4 + tools/puppet/manifests/classes/php_cartridge.pp | 30 +++--- tools/puppet/manifests/nodes.pp | 19 ++-- 24 files changed, 411 insertions(+), 55 deletions(-) ----------------------------------------------------------------------
