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/924c56fc Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/924c56fc Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/924c56fc Branch: refs/heads/master Commit: 924c56fc13c32d54c8906b478801421904e9d321 Parents: 2babfda 256cb0a Author: Udara Liyanage <[email protected]> Authored: Wed Dec 18 12:03:16 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Wed Dec 18 12:03:16 2013 -0500 ---------------------------------------------------------------------- .../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 ++++++++++++-------- .../stratos/autoscaler/util/AutoscalerUtil.java | 9 +- .../distribution/src/main/conf/autoscaler.xml | 1 + 7 files changed, 87 insertions(+), 49 deletions(-) ----------------------------------------------------------------------
