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/8b9a803b Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8b9a803b Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8b9a803b Branch: refs/heads/master Commit: 8b9a803b9e4b6ca7cf71dfff6fa19f42c22d5ada Parents: a97aa58 924c56f Author: Manula Thantriwatte <[email protected]> Authored: Wed Dec 18 12:09:27 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Wed Dec 18 12:09:27 2013 +0530 ---------------------------------------------------------------------- .../adc/mgt/client/AutoscalerServiceClient.java | 13 ++- .../client/CloudControllerServiceClient.java | 9 +- .../adc/mgt/utils/CartridgeConstants.java | 5 + .../autoscaler/api/AutoScalerServiceImpl.java | 2 +- .../cloud/controller/CloudControllerClient.java | 97 ++++++++++++-------- .../autoscaler/policy/PolicyManager.java | 10 +- .../stratos/autoscaler/util/AutoscalerUtil.java | 9 +- .../distribution/src/main/conf/autoscaler.xml | 1 + 8 files changed, 93 insertions(+), 53 deletions(-) ----------------------------------------------------------------------
