Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 586eb5b f634cd1)
Merge "Add hieradata for Manila v1 and v2 endpoints"
authorJenkins <jenkins@review.openstack.org>
Thu, 11 Aug 2016 11:24:38 +0000 (11:24 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 11 Aug 2016 11:24:38 +0000 (11:24 +0000)
1  2 
network/endpoints/endpoint_data.yaml patch | diff1 | diff2 | blob | history
network/endpoints/endpoint_map.yaml patch | diff1 | diff2 | blob | history

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