Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: aea2004 65bad0e)
Merge "Set vnc to use controller virtual_ip"
authorJenkins <jenkins@review.openstack.org>
Mon, 25 Aug 2014 04:23:32 +0000 (04:23 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 25 Aug 2014 04:23:32 +0000 (04:23 +0000)
1  2 
nova-compute-instance.yaml patch | diff1 | diff2 | blob | history
overcloud-source.yaml patch | diff1 | diff2 | blob | history

diff --cc nova-compute-instance.yaml
Simple merge
diff --cc overcloud-source.yaml
Simple merge