You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2015/02/19 04:43:08 UTC

[1/2] stratos git commit: changing region of sample openstack deployment policy default->RegionOne

Repository: stratos
Updated Branches:
  refs/heads/master 6fdb471f1 -> d27bc64ac


changing region of sample openstack deployment policy default->RegionOne


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

Branch: refs/heads/master
Commit: 530235bd002967ce15f7e4f80cde1184055fc1bd
Parents: 96133e4
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu Feb 19 09:11:36 2015 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Feb 19 09:11:36 2015 +0530

----------------------------------------------------------------------
 .../single-cartridge/artifacts/openstack/deployment-policy.json    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/530235bd/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json b/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json
index f98213a..cf8d9f7 100644
--- a/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json
+++ b/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json
@@ -11,7 +11,7 @@
                         "property": [
                             {
                                 "name": "region",
-                                "value": "default"
+                                "value": "RegionOne"
                             }
                         ]
                     }


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

Posted by ud...@apache.org.
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/d27bc64a
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d27bc64a
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d27bc64a

Branch: refs/heads/master
Commit: d27bc64acdc5a1702e58d5be5f8e2ec374750eaa
Parents: 530235b 6fdb471
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu Feb 19 09:12:51 2015 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Feb 19 09:12:51 2015 +0530

----------------------------------------------------------------------
 .../dependency/DependencyBuilder.java           |  50 +-
 .../applications/dependency/DependencyTree.java |  23 +
 .../context/ApplicationChildContext.java        |   2 +-
 .../context/ApplicationChildContextFactory.java |  32 +-
 .../parser/DefaultApplicationParser.java        | 103 +-
 .../topic/ApplicationsEventPublisher.java       |  51 +-
 .../publisher/ClusterStatusEventPublisher.java  |   5 +
 .../monitor/cluster/ClusterMonitor.java         |  21 +-
 .../monitor/component/ApplicationMonitor.java   |  12 +-
 .../monitor/component/GroupMonitor.java         |   2 +-
 .../component/ParentComponentMonitor.java       |   2 +-
 .../autoscaler/pojo/policy/PolicyManager.java   |   4 +-
 .../group/GroupStatusInactiveProcessor.java     |   6 +-
 .../TenantAwareLoadBalanceEndpoint.java         |   8 +-
 .../messaging/domain/application/Group.java     |   4 +
 .../stratos/mock/iaas/api/MockIaasApi.java      |  37 +-
 .../iaas/internal/MockIaasServiceComponent.java |   6 +
 .../iaas/services/impl/MockIaasServiceImpl.java |   5 -
 .../modules/extensions/extensionhandler.py      |   2 +-
 .../tests/SampleApplicationsTest.java           |  11 +-
 .../artifacts/application.json                  |  12 +-
 .../artifacts/autoscaling-policy.json           |   2 +-
 .../scripts/common/deploy.sh                    |   2 +-
 .../scripts/common/undeploy.sh                  |   2 +-
 .../complex-app/artifacts/application.json      |  10 +-
 .../artifacts/autoscaling-policy.json           |   2 +-
 .../complex-app/scripts/common/deploy.sh        |   2 +-
 .../complex-app/scripts/common/undeploy.sh      |   2 +-
 .../artifacts/application.json                  |   4 +-
 .../artifacts/autoscaling-policy.json           |   2 +-
 .../sample-cartridges/scripts/common/deploy.sh  |   2 +-
 .../scripts/common/undeploy.sh                  |   2 +-
 .../sample-groups/artifacts/application.json    |   6 +-
 .../artifacts/autoscaling-policy.json           |   2 +-
 .../sample-groups/scripts/common/deploy.sh      |   2 +-
 .../sample-groups/scripts/common/undeploy.sh    |   2 +-
 .../group-cartridges/artifacts/application.json |   4 +-
 .../artifacts/autoscaling-policy.json           |   2 +-
 .../group-cartridges/scripts/common/deploy.sh   |   2 +-
 .../group-cartridges/scripts/common/undeploy.sh |   2 +-
 .../more-complex-app/artifacts/application.json |  18 +-
 .../artifacts/autoscaling-policy.json           |   2 +-
 .../more-complex-app/scripts/common/deploy.sh   |   2 +-
 .../more-complex-app/scripts/common/undeploy.sh |   2 +-
 .../nested-group/artifacts/application.json     |   6 +-
 .../artifacts/autoscaling-policy.json           |   2 +-
 .../nested-group/scripts/common/deploy.sh       |   2 +-
 .../nested-group/scripts/common/undeploy.sh     |   2 +-
 .../single-cartridge/artifacts/application.json |   2 +-
 .../single-cartridge/scripts/common/deploy.sh   |   2 +-
 .../artifacts/application.json                  |   2 +-
 .../artifacts/autoscaling-policy.json           |   2 +-
 .../scripts/common/deploy.sh                    |   2 +-
 .../scripts/common/undeploy.sh                  |   2 +-
 .../single-group-v1/artifacts/application.json  |   4 +-
 .../artifacts/autoscaling-policy.json           |   2 +-
 .../single-group-v1/scripts/common/deploy.sh    |   2 +-
 .../single-group-v1/scripts/common/undeploy.sh  |   2 +-
 .../single-group-v2/artifacts/application.json  |  10 +-
 .../artifacts/autoscaling-policy.json           |   2 +-
 .../single-group-v2/scripts/common/deploy.sh    |   2 +-
 .../single-group-v2/scripts/common/undeploy.sh  |   2 +-
 .../single-group-v3/artifacts/application.json  |   2 +-
 .../artifacts/autoscaling-policy.json           |   2 +-
 .../single-group-v3/scripts/common/deploy.sh    |   2 +-
 .../single-group-v3/scripts/common/undeploy.sh  |   2 +-
 samples/applications/wordpress/README.md        |  17 +
 .../wordpress/artifacts/application.json        |  41 +
 .../wordpress/artifacts/autoscaling-policy.json |  14 +
 .../artifacts/ec2/deployment-policy.json        |  55 ++
 .../artifacts/kubernetes/deployment-policy.json |  55 ++
 .../kubernetes/kubernetes-cluster.json          |  56 ++
 .../artifacts/mock/deployment-policy.json       |  55 ++
 .../artifacts/openstack/deployment-policy.json  |  55 ++
 .../wordpress/scripts/common/deploy.sh          |  43 +
 .../wordpress/scripts/common/undeploy.sh        |  24 +
 .../wordpress/scripts/ec2/deploy.sh             |   9 +
 .../wordpress/scripts/ec2/undeploy.sh           |   7 +
 .../wordpress/scripts/kubernetes/deploy.sh      |  15 +
 .../wordpress/scripts/kubernetes/undeploy.sh    |  13 +
 .../wordpress/scripts/mock/deploy.sh            |   9 +
 .../wordpress/scripts/mock/undeploy.sh          |   7 +
 .../wordpress/scripts/openstack/deploy.sh       |   9 +
 .../wordpress/scripts/openstack/undeploy.sh     |   7 +
 samples/cartridges-groups/group6c.json          |   2 +-
 samples/cartridges-groups/mysql-php-group.json  |  17 +
 .../src/main/resources/AutoscalerService.wsdl   | 212 ++---
 .../main/resources/CloudControllerService.wsdl  | 928 +++++++++----------
 88 files changed, 1375 insertions(+), 809 deletions(-)
----------------------------------------------------------------------