You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2013/12/11 09:32:13 UTC

[21/21] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos

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/2bd2d4ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2bd2d4ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2bd2d4ae

Branch: refs/heads/master
Commit: 2bd2d4aea59ad224205ece8ce0ce7a3193d0e7a2
Parents: 7e4c4d4 0e1e047
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Wed Dec 11 14:00:35 2013 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Wed Dec 11 14:00:35 2013 +0530

----------------------------------------------------------------------
 .../adc/mgt/client/AutoscalerServiceClient.java |  24 +-
 .../autoscaler/NetworkPartitionContext.java     |  30 ++
 .../autoscaler/api/AutoScalerServiceImpl.java   |  95 +++++-
 .../interfaces/AutoScalerServiceInterface.java  |   5 +-
 .../cloud/controller/pojo/CartridgeInfo.java    |  10 +
 .../controller/util/CloudControllerUtil.java    |   1 +
 .../rest/endpoint/services/ServiceUtils.java    | 330 +++++++++++--------
 .../src/main/resources/AutoScalerService.wsdl   | 214 ++++++++++--
 .../main/resources/CloudControllerService.wsdl  |  13 +-
 9 files changed, 535 insertions(+), 187 deletions(-)
----------------------------------------------------------------------