Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: adefda0 16093c3)
Merge "Allow a user to specify a comma separated list of ntp servers"
authorJenkins <jenkins@review.openstack.org>
Wed, 11 Nov 2015 10:44:05 +0000 (10:44 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 11 Nov 2015 10:44:05 +0000 (10:44 +0000)
1  2 
overcloud-without-mergepy.yaml patch | diff1 | diff2 | blob | history
puppet/compute.yaml patch | diff1 | diff2 | blob | history
puppet/controller.yaml patch | diff1 | diff2 | blob | history

diff --cc overcloud-without-mergepy.yaml
Simple merge
diff --cc puppet/compute.yaml
Simple merge
diff --cc puppet/controller.yaml
Simple merge