Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 8e1fd53 e3b0d95)
Merge "Fix typo in HostsEntry output description"
authorJenkins <jenkins@review.openstack.org>
Fri, 18 Dec 2015 11:00:33 +0000 (11:00 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 18 Dec 2015 11:00:33 +0000 (11:00 +0000)
1  2 
overcloud.yaml patch | diff1 | diff2 | blob | history
puppet/all-nodes-config.yaml patch | diff1 | diff2 | blob | history

diff --cc overcloud.yaml
Simple merge
diff --cc puppet/all-nodes-config.yaml
Simple merge