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/622410e7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/622410e7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/622410e7 Branch: refs/heads/master Commit: 622410e72b95f962f7f2af7351d411c3d5de1d80 Parents: 0e1b38e 30eb003 Author: Isuru <[email protected]> Authored: Thu Dec 12 23:19:46 2013 +0530 Committer: Isuru <[email protected]> Committed: Thu Dec 12 23:19:46 2013 +0530 ---------------------------------------------------------------------- .../autoscaler/api/AutoScalerServiceImpl.java | 2 +- .../autoscaler/policy/PolicyManager.java | 50 +++++++++++++- .../stratos/autoscaler/util/AutoscalerUtil.java | 39 ----------- .../stratos/cli/RestCommandLineService.java | 4 ++ .../apache/stratos/cli/utils/CliConstants.java | 2 +- .../conf/LoadBalancerConfiguration.java | 2 +- .../health/stat/AverageLoadAverageEvent.java | 58 +++++++++++++++++ .../stat/AverageMemoryConsumptionEvent.java | 58 +++++++++++++++++ .../stat/AverageRequestsInFlightEvent.java | 58 +++++++++++++++++ .../health/stat/GradientOfLoadAverageEvent.java | 58 +++++++++++++++++ .../stat/GradientOfMemoryConsumptionEvent.java | 58 +++++++++++++++++ .../stat/GradientOfRequestsInFlightEvent.java | 58 +++++++++++++++++ .../stat/MemberAverageLoadAverageEvent.java | 50 ++++++++++++++ .../MemberAverageMemoryConsumptionEvent.java | 49 ++++++++++++++ .../event/health/stat/MemberFaultEvent.java | 68 ++++++++++++++++++++ .../stat/MemberGradientOfLoadAverageEvent.java | 50 ++++++++++++++ .../MemberGradientOfMemoryConsumptionEvent.java | 50 ++++++++++++++ ...emberSecondDerivativeOfLoadAverageEvent.java | 50 ++++++++++++++ ...econdDerivativeOfMemoryConsumptionEvent.java | 50 ++++++++++++++ .../SecondDerivativeOfLoadAverageEvent.java | 58 +++++++++++++++++ ...econdDerivativeOfMemoryConsumptionEvent.java | 49 ++++++++++++++ ...SecondDerivativeOfRequestsInFlightEvent.java | 58 +++++++++++++++++ 22 files changed, 935 insertions(+), 44 deletions(-) ----------------------------------------------------------------------
