Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 869a88d 301560b)
Merge "Set os-refresh-config timeout to 4 hours"
authorJenkins <jenkins@review.openstack.org>
Mon, 11 Jul 2016 09:30:42 +0000 (09:30 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 11 Jul 2016 09:30:42 +0000 (09:30 +0000)
1  2 
puppet/ceph-storage.yaml patch | diff1 | diff2 | blob | history
puppet/cinder-storage.yaml patch | diff1 | diff2 | blob | history
puppet/compute.yaml patch | diff1 | diff2 | blob | history
puppet/controller.yaml patch | diff1 | diff2 | blob | history
puppet/swift-storage.yaml patch | diff1 | diff2 | blob | history

diff --cc puppet/ceph-storage.yaml
Simple merge
diff --cc puppet/cinder-storage.yaml
Simple merge
diff --cc puppet/compute.yaml
Simple merge
diff --cc puppet/controller.yaml
Simple merge
diff --cc puppet/swift-storage.yaml
Simple merge