Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 9badd74 ab068a8)
Merge "Nova Neutron configuration now uses keystone v3 endpoint"
authorJenkins <jenkins@review.openstack.org>
Wed, 24 Feb 2016 10:07:48 +0000 (10:07 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 24 Feb 2016 10:07:48 +0000 (10:07 +0000)
1  2 
network/endpoints/endpoint_map.yaml patch | diff1 | diff2 | blob | history
puppet/compute.yaml patch | diff1 | diff2 | blob | history

diff --cc network/endpoints/endpoint_map.yaml
Simple merge
diff --cc puppet/compute.yaml
Simple merge