Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7d4abd0b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7d4abd0b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7d4abd0b

Branch: refs/heads/master
Commit: 7d4abd0bc59dbf38ffc49f4513d9f0a44d06e44c
Parents: d189b13 a2c6200
Author: R-Rajkumar <[email protected]>
Authored: Tue Oct 14 19:57:23 2014 +0530
Committer: R-Rajkumar <[email protected]>
Committed: Tue Oct 14 19:57:23 2014 +0530

----------------------------------------------------------------------
 .../autoscaler/api/AutoScalerServiceImpl.java   |    2 +-
 .../exception/InvalidArgumentException.java     |   46 +
 .../interfaces/AutoScalerServiceInterface.java  |    2 +-
 .../monitor/AbstractClusterMonitor.java         |    3 +-
 .../KubernetesServiceClusterMonitor.java        |   13 +-
 .../autoscaler/monitor/VMLbClusterMonitor.java  |    3 +-
 .../monitor/VMServiceClusterMonitor.java        |    3 +-
 .../impl/CloudControllerServiceImpl.java        |    3 +
 .../manager/client/AutoscalerServiceClient.java |    2 +-
 .../rest/endpoint/services/ServiceUtils.java    |    9 +-
 .../src/main/resources/AutoScalerService.wsdl   | 1222 +++++++++---------
 11 files changed, 698 insertions(+), 610 deletions(-)
----------------------------------------------------------------------


Reply via email to