Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f3653d32 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f3653d32 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f3653d32 Branch: refs/heads/master Commit: f3653d32eb1cf18b8983b10ee616d2444790d013 Parents: 4c48d89 e2815f6 Author: Imesh Gunaratne <[email protected]> Authored: Sun Oct 26 08:17:32 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Sun Oct 26 08:17:32 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/PartitionContext.java | 23 +-- .../KubernetesServiceClusterMonitor.java | 4 +- .../autoscaler/monitor/VMLbClusterMonitor.java | 4 +- .../monitor/VMServiceClusterMonitor.java | 4 +- .../autoscaler/util/AutoScalerConstants.java | 6 +- .../impl/CloudControllerServiceImpl.java | 172 +++++-------------- .../common/constants/StratosConstants.java | 6 +- .../distribution/src/main/conf/autoscaler.xml | 21 ++- .../lib/puppet/parser/functions/difference.rb | 17 ++ 9 files changed, 108 insertions(+), 149 deletions(-) ----------------------------------------------------------------------
