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/d387d640 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d387d640 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d387d640 Branch: refs/heads/master Commit: d387d640f80cb0870adc2baff2f3da8c44c03c72 Parents: 4939adf d4a6119 Author: Imesh Gunaratne <[email protected]> Authored: Mon Dec 2 23:08:22 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Mon Dec 2 23:08:22 2013 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/ClusterContext.java | 29 +++++ .../cloud/controller/CloudControllerClient.java | 1 - .../deployment/policy/DeploymentPolicy.java | 9 +- .../event/AverageRequestsInFlightEvent.java | 4 +- .../event/GradientOfRequestsInFlightEvent.java | 4 +- ...SecondDerivativeOfRequestsInFlightEvent.java | 6 +- .../internal/AutoscalerServerComponent.java | 3 - .../health/HealthEventMessageDelegator.java | 112 +++++++++++-------- .../receiver/health/HealthEventQueue.java | 4 +- .../autoscaler/rule/ExecutorTaskScheduler.java | 12 +- .../processors/AutoscalerTopologyReceiver.java | 40 ++++++- .../topology/processors/TopologyReceiver.java | 1 - .../stratos/autoscaler/util/ConfUtil.java | 11 +- .../impl/CloudControllerServiceImpl.java | 6 +- .../internal/CloudControllerDSComponent.java | 69 +++++++++--- .../runtime/FasterLookUpDataHolder.java | 4 +- .../controller/topology/TopologyManager.java | 75 ++++++++----- .../controller/util/CloudControllerUtil.java | 37 ++++++ .../controller/util/ServiceReferenceHolder.java | 10 ++ .../event/topology/MemberStartedEvent.java | 15 +++ 20 files changed, 325 insertions(+), 127 deletions(-) ----------------------------------------------------------------------
