Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: fcafc26 e61f76b)
Merge "Add IronicInspector settings to the network map"
authorJenkins <jenkins@review.openstack.org>
Sat, 20 May 2017 00:18:51 +0000 (00:18 +0000)
committerGerrit Code Review <review@openstack.org>
Sat, 20 May 2017 00:18:51 +0000 (00:18 +0000)
1  2 
network/endpoints/endpoint_map.yaml patch | diff1 | diff2 | blob | history
network/service_net_map.j2.yaml patch | diff1 | diff2 | blob | history

diff --cc network/endpoints/endpoint_map.yaml
Simple merge
diff --cc network/service_net_map.j2.yaml
Simple merge