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/00569d41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/00569d41 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/00569d41 Branch: refs/heads/master Commit: 00569d41ecf89285ecc2de4db2731707e3c7ebea Parents: 8d26bfb fcf1dc7 Author: Imesh Gunaratne <[email protected]> Authored: Tue Dec 3 22:04:53 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Dec 3 22:04:53 2013 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/ClusterContext.java | 5 +- .../stratos/autoscaler/ClusterMonitor.java | 9 ++- .../stratos/autoscaler/PartitionContext.java | 6 ++ .../cloud/controller/CloudControllerClient.java | 18 +++++ .../rule/AutoscalerRuleEvaluator.java | 16 ++-- .../processors/AutoscalerTopologyReceiver.java | 34 ++++---- .../stratos/autoscaler/util/AutoscalerUtil.java | 3 +- .../src/test/resources/autoscaler.drl | 4 +- .../impl/CloudControllerServiceImpl.java | 82 +++++++++++--------- .../runtime/FasterLookUpDataHolder.java | 14 +++- 10 files changed, 117 insertions(+), 74 deletions(-) ----------------------------------------------------------------------
