Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 9f44208 dcfbcb6)
Merge "Make Wait Conditions depend on config creation"
authorJenkins <jenkins@review.openstack.org>
Wed, 5 Mar 2014 09:29:37 +0000 (09:29 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 5 Mar 2014 09:29:37 +0000 (09:29 +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