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/1aacd8bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/1aacd8bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/1aacd8bd Branch: refs/heads/master Commit: 1aacd8bd47a8edc72076f9f3a19cc2665500236d Parents: 34544d5 8c6a58c Author: Imesh Gunaratne <[email protected]> Authored: Fri Dec 20 20:47:34 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri Dec 20 20:47:34 2013 +0530 ---------------------------------------------------------------------- .../autoscaler/NetworkPartitionContext.java | 12 ++--- .../stratos/autoscaler/PartitionContext.java | 4 +- .../cloud/controller/CloudControllerClient.java | 21 ++++----- .../deployment/policy/DeploymentPolicy.java | 5 +- .../internal/AutoscalerServerComponent.java | 25 ++++++---- .../health/HealthEventMessageDelegator.java | 42 ++++++++++------- .../autoscaler/policy/PolicyManager.java | 30 +++++------- .../autoscaler/registry/RegistryManager.java | 6 +-- .../topology/AutoscalerTopologyReceiver.java | 8 ++-- .../health/stat/AverageLoadAverageEvent.java | 25 ++++------ .../stat/AverageMemoryConsumptionEvent.java | 25 ++++------ .../stat/AverageRequestsInFlightEvent.java | 24 ++++------ .../health/stat/GradientOfLoadAverageEvent.java | 24 ++++------ .../stat/GradientOfMemoryConsumptionEvent.java | 24 ++++------ .../stat/GradientOfRequestsInFlightEvent.java | 24 ++++------ .../stat/MemberAverageLoadAverageEvent.java | 17 +++---- .../MemberAverageMemoryConsumptionEvent.java | 16 +++---- .../event/health/stat/MemberFaultEvent.java | 31 +++++-------- .../stat/MemberGradientOfLoadAverageEvent.java | 17 +++---- .../MemberGradientOfMemoryConsumptionEvent.java | 17 +++---- ...emberSecondDerivativeOfLoadAverageEvent.java | 17 +++---- ...econdDerivativeOfMemoryConsumptionEvent.java | 17 +++---- .../SecondDerivativeOfLoadAverageEvent.java | 24 ++++------ ...econdDerivativeOfMemoryConsumptionEvent.java | 17 +++---- ...SecondDerivativeOfRequestsInFlightEvent.java | 24 ++++------ .../stat/AverageLoadAverageEventListener.java | 28 ++++++++++++ .../AverageMemoryConsumptionEventListener.java | 28 ++++++++++++ .../AverageRequestsInFlightEventListener.java | 28 ++++++++++++ .../GradientOfLoadAverageEventListener.java | 28 ++++++++++++ ...radientOfMemoryConsumptionEventListener.java | 28 ++++++++++++ ...GradientOfRequestsInFlightEventListener.java | 28 ++++++++++++ .../MemberAverageLoadAverageEventListener.java | 29 ++++++++++++ ...erAverageMemoryConsumptionEventListener.java | 28 ++++++++++++ .../health/stat/MemberFaultEventListener.java | 28 ++++++++++++ ...emberGradientOfLoadAverageEventListener.java | 48 ++++++++++++++++++++ ...radientOfMemoryConsumptionEventListener.java | 28 ++++++++++++ ...ondDerivativeOfLoadAverageEventListener.java | 28 ++++++++++++ ...ivativeOfMemoryConsumptionEventListener.java | 28 ++++++++++++ ...ondDerivativeOfLoadAverageEventListener.java | 28 ++++++++++++ ...ivativeOfMemoryConsumptionEventListener.java | 28 ++++++++++++ ...rivativeOfRequestsInFlightEventListener.java | 28 ++++++++++++ .../tenant/TenantRemovedEventListener.java | 7 ++- .../topology/ClusterCreatedEventListener.java | 6 +-- .../topology/ClusterRemovedEventListener.java | 6 +-- .../topology/CompleteTopologyEventListener.java | 6 +-- .../topology/InstanceSpawnedEventListener.java | 6 +-- .../topology/MemberActivatedEventListener.java | 6 +-- .../topology/MemberStartedEventListener.java | 6 +-- .../topology/MemberSuspendedEventListener.java | 7 +-- .../topology/MemberTerminatedEventListener.java | 6 +-- .../topology/ServiceCreatedEventListener.java | 6 +-- .../topology/ServiceRemovedEventListener.java | 6 +-- .../modules/scripts/ec2/cartridge-agent.sh | 36 +++++++++++++-- 53 files changed, 728 insertions(+), 341 deletions(-) ----------------------------------------------------------------------
