Merge branch 'master' of 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/dd256fe7 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dd256fe7 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dd256fe7 Branch: refs/heads/master Commit: dd256fe72cf4f8cbefccb6299822eccff9d2b6df Parents: 4ae51e3 059b2da Author: Vishanth <[email protected]> Authored: Thu Jan 29 12:16:34 2015 +0530 Committer: Vishanth <[email protected]> Committed: Thu Jan 29 12:16:34 2015 +0530 ---------------------------------------------------------------------- .../applications/single-cartridge/artifacts/application.json | 4 ++-- .../iaases/ec2/artifacts/dep_single_group.json | 2 +- .../iaases/kubernetes/artifacts/deployment-policy.json | 2 +- .../single-cartridge/iaases/kubernetes/deploy.sh | 8 ++++---- .../single-cartridge/iaases/kubernetes/undeploy.sh | 2 +- .../iaases/mock/artifacts/deployment-policy.json | 2 +- .../iaases/openstack/artifacts/dep_single_group.json | 2 +- .../applications/single-cartridge/iaases/openstack/deploy.sh | 2 +- samples/cartridges/kubernetes/php.json | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
