summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-10-06 08:37:22 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2015-10-06 08:37:22 -0400
commitc22b5f256d9d673ea7466a320d2efb50b512b700 (patch)
tree08098cf49cd5f306813876c44676ff702fd80726
parent9fd4af295a7c88b4c112b9bd500e396a766b3dc0 (diff)
parentf0b52c736130e8f155786a0df4da7408a96a9d70 (diff)
downloadopenshift-c22b5f256d9d673ea7466a320d2efb50b512b700.tar.gz
openshift-c22b5f256d9d673ea7466a320d2efb50b512b700.tar.bz2
openshift-c22b5f256d9d673ea7466a320d2efb50b512b700.tar.xz
openshift-c22b5f256d9d673ea7466a320d2efb50b512b700.zip
Merge pull request #653 from arsogukpinar/master
Fix for name conflict
-rw-r--r--roles/openshift_examples/files/examples/xpaas-templates/eap6-https-sti.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_examples/files/examples/xpaas-templates/eap6-https-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/eap6-https-sti.json
index 0497e6824..5df36ccc2 100644
--- a/roles/openshift_examples/files/examples/xpaas-templates/eap6-https-sti.json
+++ b/roles/openshift_examples/files/examples/xpaas-templates/eap6-https-sti.json
@@ -6,10 +6,10 @@
"iconClass" : "icon-jboss",
"description": "Application template for EAP 6 applications built using STI."
},
- "name": "eap6-basic-sti"
+ "name": "eap6-https-sti"
},
"labels": {
- "template": "eap6-basic-sti"
+ "template": "eap6-https-sti"
},
"parameters": [
{