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/5314c31c Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5314c31c Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5314c31c Branch: refs/heads/master Commit: 5314c31c27c35219c052202accf334ade6091d67 Parents: 10808d0 dbaeda0 Author: Imesh Gunaratne <[email protected]> Authored: Fri Dec 20 15:34:55 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri Dec 20 15:34:55 2013 +0530 ---------------------------------------------------------------------- .../health/stat/AverageLoadAverageEvent.java | 6 +- .../stat/AverageMemoryConsumptionEvent.java | 6 +- .../stat/AverageRequestsInFlightEvent.java | 6 +- .../health/stat/GradientOfLoadAverageEvent.java | 6 +- .../stat/GradientOfMemoryConsumptionEvent.java | 6 +- .../stat/GradientOfRequestsInFlightEvent.java | 6 +- .../event/health/stat/HealthStatEvent.java | 32 ++++++++++ .../stat/MemberAverageLoadAverageEvent.java | 6 +- .../MemberAverageMemoryConsumptionEvent.java | 6 +- .../event/health/stat/MemberFaultEvent.java | 6 +- .../stat/MemberGradientOfLoadAverageEvent.java | 6 +- .../MemberGradientOfMemoryConsumptionEvent.java | 6 +- ...emberSecondDerivativeOfLoadAverageEvent.java | 6 +- ...econdDerivativeOfMemoryConsumptionEvent.java | 6 +- .../SecondDerivativeOfLoadAverageEvent.java | 5 +- ...econdDerivativeOfMemoryConsumptionEvent.java | 6 +- ...SecondDerivativeOfRequestsInFlightEvent.java | 6 +- .../AverageLoadAverageMessageProcessor.java | 66 +++++++++++++++++++ ...verageMemoryConsumptionMessageProcessor.java | 66 +++++++++++++++++++ ...AverageRequestsInFlightMessageProcessor.java | 66 +++++++++++++++++++ .../GradientOfLoadAverageMessageProcessor.java | 66 +++++++++++++++++++ ...ientOfMemoryConsumptionMessageProcessor.java | 65 +++++++++++++++++++ ...dientOfRequestsInFlightMessageProcessor.java | 66 +++++++++++++++++++ ...emberAverageLoadAverageMessageProcessor.java | 66 +++++++++++++++++++ ...verageMemoryConsumptionMessageProcessor.java | 66 +++++++++++++++++++ .../stat/MemberFaultMessageProcessor.java | 66 +++++++++++++++++++ ...erGradientOfLoadAverageMessageProcessor.java | 66 +++++++++++++++++++ ...ientOfMemoryConsumptionMessageProcessor.java | 67 ++++++++++++++++++++ ...DerivativeOfLoadAverageMessageProcessor.java | 66 +++++++++++++++++++ ...tiveOfMemoryConsumptionMessageProcessor.java | 66 +++++++++++++++++++ ...DerivativeOfLoadAverageMessageProcessor.java | 66 +++++++++++++++++++ ...tiveOfMemoryConsumptionMessageProcessor.java | 66 +++++++++++++++++++ ...ativeOfRequestsInFlightMessageProcessor.java | 66 +++++++++++++++++++ .../modules/scripts/ec2/cartridge-agent.sh | 19 +++--- 34 files changed, 1129 insertions(+), 73 deletions(-) ----------------------------------------------------------------------
