Merge branch 'container-autoscaling' of https://git-wip-us.apache.org/repos/asf/stratos into container-autoscaling
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c6329077 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c6329077 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c6329077 Branch: refs/heads/container-autoscaling Commit: c6329077e8eb1c5c931b3c4be2b0cb48ead20e22 Parents: 0724bdc 4d59205 Author: R-Rajkumar <[email protected]> Authored: Thu Oct 9 19:09:07 2014 +0530 Committer: R-Rajkumar <[email protected]> Committed: Thu Oct 9 19:09:07 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/NetworkPartitionContext.java | 7 +- .../deployment/policy/DeploymentPolicy.java | 10 +- .../autoscaler/partition/PartitionGroup.java | 8 +- .../agent/data/publisher/DataContext.java | 20 +- .../stratos/cli/beans/cartridge/Cartridge.java | 13 +- .../controller/axiom/AxiomXpathParserUtil.java | 20 +- .../impl/CloudControllerServiceImpl.java | 135 ++- .../interfaces/CloudControllerService.java | 33 +- .../internal/CloudControllerDSComponent.java | 30 +- .../controller/pojo/NetworkInterfaces.java | 6 +- .../cloud/controller/pojo/Persistence.java | 7 +- .../cloud/controller/pojo/Properties.java | 6 +- .../common/kubernetes/KubernetesGroup.java | 6 +- .../stratos/common/kubernetes/Properties.java | 6 +- .../apache/stratos/manager/dto/Cartridge.java | 15 +- .../manager/dto/RepositoryInformation.java | 7 +- .../manager/service/RepositoryInfoBean.java | 26 +- .../stratos/messaging/util/Properties.java | 12 +- .../endpoint/bean/kubernetes/Properties.java | 6 +- .../activity/beans/PaginatedTenantDataBean.java | 7 +- .../mgt/beans/PaginatedTenantInfoBean.java | 7 +- components/pom.xml | 2 +- .../main/resources/CloudControllerService.wsdl | 890 ++++++++++--------- 23 files changed, 753 insertions(+), 526 deletions(-) ----------------------------------------------------------------------
