You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/05/21 16:13:47 UTC
[20/23] stratos git commit: Merge branch 'master' of
https://github.com/apache/stratos
Merge branch 'master' of https://github.com/apache/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6e8d6140
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6e8d6140
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6e8d6140
Branch: refs/heads/master
Commit: 6e8d6140cd2d5ddb73959258afc3a66e5cde6b30
Parents: ca916d4 a28acec
Author: Dinithi <di...@wso2.com>
Authored: Thu May 21 09:26:17 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Thu May 21 09:26:17 2015 +0530
----------------------------------------------------------------------
.../services/impl/AutoscalerServiceImpl.java | 25 +-
.../stratos/autoscaler/util/AutoscalerUtil.java | 31 +-
.../stratos/cli/RestCommandLineService.java | 13 +
.../apache/stratos/cli/StratosApplication.java | 3 +
.../cli/commands/UpdateApplicationCommand.java | 125 ++++
.../controller/domain/InstanceMetadata.java | 9 +
.../iaases/kubernetes/KubernetesIaas.java | 31 +-
.../kubernetes/client/KubernetesApiClient.java | 13 +-
.../KubernetesAPIClientInterface.java | 12 +-
.../kubernetes/client/model/Container.java | 33 +-
.../client/live/AbstractLiveTest.java | 4 +-
.../live/KubernetesApiClientLiveTest.java | 8 +-
products/stratos/modules/integration/pom.xml | 12 -
.../application-policy-1.json | 6 +-
.../application-policy-2.json | 6 +-
.../application-policy-3.json | 6 +-
.../application-policy-4.json | 6 +-
.../application-policy-5.json | 6 +-
.../artifacts/application.json | 11 +-
.../wordpress-app/artifacts/application.json | 10 +-
.../artifacts/application.json | 60 +-
.../artifacts/application.json | 166 ++---
.../artifacts/application.json | 354 +++++------
.../artifacts/application.json | 36 +-
.../artifacts/application.json | 58 +-
.../artifacts/deployment-policy.json | 26 +-
.../artifacts/application-signup.json | 32 +-
.../artifacts/application.json | 42 +-
.../artifacts/domain-mappings.json | 6 +-
.../artifacts/application.json | 26 +-
.../sample-groups/artifacts/application.json | 40 +-
.../artifacts/application.json | 46 +-
.../group-scaling-v1/artifacts/application.json | 22 +-
.../artifacts/application.json | 12 +-
.../artifacts/application-signup.json | 32 +-
.../artifacts/domain-mappings.json | 6 +-
.../scripts/kubernetes/deploy.sh | 2 +-
.../scripts/kubernetes/undeploy.sh | 2 +-
.../autoscaling-policy-1.json | 22 +-
samples/cartridge-groups/db-group.json | 20 +-
samples/cartridge-groups/esb-php-group.json | 2 +-
...sted-with-esb-php-nested-with-mysql-php.json | 18 +-
samples/cartridge-groups/group1.json | 4 +-
samples/cartridge-groups/group1b.json | 2 +-
samples/cartridge-groups/group6c3.json | 2 +-
samples/cartridge-groups/group6c6.json | 2 +-
samples/cartridge-groups/group6c7.json | 8 +-
samples/cartridge-groups/n-level-nesting.json | 68 +-
samples/cartridge-groups/tomcat-group.json | 2 +-
samples/cartridges/ec2/c1.json | 1 -
samples/cartridges/ec2/c2.json | 1 -
samples/cartridges/ec2/c3.json | 1 -
samples/cartridges/ec2/c4.json | 1 -
samples/cartridges/ec2/esb.json | 1 -
samples/cartridges/ec2/php.json | 1 -
samples/cartridges/ec2/tomcat.json | 1 -
samples/cartridges/ec2/tomcat1.json | 1 -
samples/cartridges/ec2/tomcat2.json | 1 -
samples/cartridges/kubernetes/c1.json | 1 -
samples/cartridges/kubernetes/c2.json | 1 -
samples/cartridges/kubernetes/c3.json | 1 -
samples/cartridges/kubernetes/c4.json | 1 -
samples/cartridges/kubernetes/esb.json | 20 +-
samples/cartridges/kubernetes/php.json | 34 +-
samples/cartridges/kubernetes/tomcat.json | 16 +-
samples/cartridges/kubernetes/tomcat1.json | 20 +-
samples/cartridges/kubernetes/tomcat2.json | 20 +-
samples/cartridges/kubernetes/tomcat3.json | 14 +-
samples/cartridges/kubernetes/wso2-is.json | 10 +-
samples/cartridges/mock/c1.json | 1 -
samples/cartridges/mock/c2.json | 1 -
samples/cartridges/mock/c3.json | 1 -
samples/cartridges/mock/c4.json | 1 -
samples/cartridges/mock/esb.json | 7 +-
samples/cartridges/mock/mysql.json | 7 +-
samples/cartridges/mock/postgres.json | 7 +-
samples/cartridges/mock/stratos-lb.json | 6 +-
samples/cartridges/mock/tomcat.json | 5 +-
samples/cartridges/mock/tomcat2.json | 5 +-
samples/cartridges/mock/tomcat3.json | 14 +-
samples/cartridges/mock/wso2-is.json | 10 +-
samples/cartridges/openstack/tomcat.json | 39 +-
samples/cartridges/openstack/tomcat1.json | 35 +-
samples/cartridges/openstack/tomcat2.json | 35 +-
.../deployment-policy-1.json | 26 +-
.../deployment-policy-2.json | 54 +-
.../deployment-policy-3.json | 26 +-
.../deployment-policy-4.json | 94 +--
.../kubernetes/network-partition-2.json | 2 +-
.../src/main/resources/AutoscalerService.wsdl | 634 +++++++++----------
90 files changed, 1430 insertions(+), 1215 deletions(-)
----------------------------------------------------------------------