Github user imesh commented on the pull request:
https://github.com/apache/stratos/pull/216#issuecomment-73284624
Thanks @dinithis for your contribution, I see following conflicts in this
pull request:
CONFLICT (content): Merge conflict in
samples/applications/single-group-v2/artifacts/mock/deployment-policy.json
CONFLICT (content): Merge conflict in
samples/applications/nested-group/artifacts/openstack/deployment-policy.json
CONFLICT (content): Merge conflict in
samples/applications/nested-group/artifacts/kubernetes/deployment-policy.json
CONFLICT (content): Merge conflict in
samples/applications/nested-group/artifacts/ec2/deployment-policy.json
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
