Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 4772570 be24147)
Merge "add heat-api-cfn to endpoint map"
authorJenkins <jenkins@review.openstack.org>
Thu, 19 May 2016 08:58:44 +0000 (08:58 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 19 May 2016 08:58:44 +0000 (08:58 +0000)
1  2 
environments/enable-tls.yaml patch | diff1 | diff2 | blob | history
network/endpoints/endpoint_data.yaml patch | diff1 | diff2 | blob | history
network/endpoints/endpoint_map.yaml patch | diff1 | diff2 | blob | history

diff --cc environments/enable-tls.yaml
Simple merge
diff --cc network/endpoints/endpoint_data.yaml
Simple merge
diff --cc network/endpoints/endpoint_map.yaml
Simple merge