You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by me...@apache.org on 2014/03/03 17:50:54 UTC

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

Branch: refs/heads/master
Commit: 7fb24d00e214d6b77f4f58dbc3cacabc7f5eb3ad
Parents: d6540d6 5bd3ffe
Author: Melan Nimesh <me...@apache.org>
Authored: Mon Mar 3 22:20:57 2014 +0530
Committer: Melan Nimesh <me...@apache.org>
Committed: Mon Mar 3 22:20:57 2014 +0530

----------------------------------------------------------------------
 .../cloud/controller/CloudControllerClient.java |  69 +-
 .../exception/InvalidPartitionException.java    |   8 +
 .../exception/InvalidPolicyException.java       |   8 +-
 .../exception/NonExistingLBException.java       |  13 +-
 .../exception/PartitionValidationException.java |  18 +-
 .../exception/PolicyValidationException.java    |  14 +-
 .../autoscaler/exception/SpawningException.java |  13 +-
 .../exception/TerminationException.java         |  12 +-
 .../autoscaler/partition/PartitionManager.java  |   8 +-
 .../stratos/cli/RestCommandLineService.java     |  44 +-
 .../InvalidCartridgeDefinitionException.java    |  13 +-
 .../InvalidCartridgeTypeException.java          |  13 +-
 .../exception/InvalidClusterException.java      |  13 +-
 .../exception/InvalidHostException.java         |  13 +-
 .../exception/InvalidIaasProviderException.java |  13 +-
 .../exception/InvalidMemberException.java       |  13 +-
 .../exception/InvalidPartitionException.java    |  11 +-
 .../exception/InvalidRegionException.java       |  11 +
 .../exception/InvalidXMLException.java          |  11 +
 .../exception/InvalidZoneException.java         |  11 +
 .../MalformedConfigurationFileException.java    |  10 +
 .../exception/NoInstanceFoundException.java     |  11 +
 .../exception/SerializationException.java       |  11 +
 .../UnregisteredCartridgeException.java         |  11 +
 .../exception/UnregisteredClusterException.java |  10 +
 .../cloud/controller/iaases/AWSEC2Iaas.java     |  10 +-
 .../impl/CloudControllerServiceImpl.java        | 233 +------
 .../interfaces/CloudControllerService.java      |  21 +-
 .../util/CloudControllerConstants.java          |   1 +
 .../validate/AWSEC2PartitionValidator.java      |   2 +-
 .../OpenstackNovaPartitionValidator.java        |   2 +-
 .../manager/client/AutoscalerServiceClient.java | 268 +++-----
 .../client/CloudControllerServiceClient.java    |  61 +-
 .../service/ServiceDeploymentManager.java       |   5 +-
 .../UnregisteredCartridgeException.java         |   6 +
 .../manager/CartridgeSubscriptionManager.java   |   7 +-
 .../rest/endpoint/services/ServiceUtils.java    | 405 +++++++----
 .../src/main/resources/AutoScalerService.wsdl   | 678 ++++++++++---------
 .../pom.xml                                     |   2 +-
 .../main/resources/CloudControllerService.wsdl  |  96 ++-
 40 files changed, 1186 insertions(+), 993 deletions(-)
----------------------------------------------------------------------