Repository: stratos Updated Branches: refs/heads/master 5f4c9da90 -> d394d6057
Fixing merge conflicts Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d394d605 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d394d605 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d394d605 Branch: refs/heads/master Commit: d394d6057e1445e9d3454c796c31fcd877bb3567 Parents: 5f4c9da Author: Imesh Gunaratne <[email protected]> Authored: Tue Jan 13 19:40:14 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Jan 13 19:40:33 2015 +0530 ---------------------------------------------------------------------- .../kubernetes/artifacts/deployment-policy.json | 1 - .../kubernetes/artifacts/kubernetes-cluster.json | 4 ++-- tools/docker-images/stratos-docker-images/README.md | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d394d605/samples/single-cartridge/kubernetes/artifacts/deployment-policy.json ---------------------------------------------------------------------- diff --git a/samples/single-cartridge/kubernetes/artifacts/deployment-policy.json b/samples/single-cartridge/kubernetes/artifacts/deployment-policy.json index d150f93..a85c0f2 100644 --- a/samples/single-cartridge/kubernetes/artifacts/deployment-policy.json +++ b/samples/single-cartridge/kubernetes/artifacts/deployment-policy.json @@ -1,5 +1,4 @@ { - "applicationId":"single-cartridge-app", "applicationPolicy":{ "networkPartition":[ { http://git-wip-us.apache.org/repos/asf/stratos/blob/d394d605/samples/single-cartridge/kubernetes/artifacts/kubernetes-cluster.json ---------------------------------------------------------------------- diff --git a/samples/single-cartridge/kubernetes/artifacts/kubernetes-cluster.json b/samples/single-cartridge/kubernetes/artifacts/kubernetes-cluster.json index 4873b70..228eeb3 100644 --- a/samples/single-cartridge/kubernetes/artifacts/kubernetes-cluster.json +++ b/samples/single-cartridge/kubernetes/artifacts/kubernetes-cluster.json @@ -33,7 +33,7 @@ "property":[ { "name":"payload_parameter.MB_IP", - "value":"10.100.0.136" + "value":"172.17.8.1" }, { "name":"payload_parameter.MB_PORT", @@ -41,7 +41,7 @@ }, { "name":"payload_parameter.CEP_IP", - "value":"10.100.0.136" + "value":"172.17.8.1" }, { "name":"payload_parameter.CEP_PORT", http://git-wip-us.apache.org/repos/asf/stratos/blob/d394d605/tools/docker-images/stratos-docker-images/README.md ---------------------------------------------------------------------- diff --git a/tools/docker-images/stratos-docker-images/README.md b/tools/docker-images/stratos-docker-images/README.md index c953967..e5d39ed 100644 --- a/tools/docker-images/stratos-docker-images/README.md +++ b/tools/docker-images/stratos-docker-images/README.md @@ -1,7 +1,7 @@ -stratos-docker -============== +Apache Stratos - Stratos Docker Images +====================================== -docker images for installing stratos +This folder contains docker image files for installing stratos. ### Building
