Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: e57a7cd 1a544f6)
Merge "Ensure yum cache is ready before update"
authorJenkins <jenkins@review.openstack.org>
Tue, 18 Jul 2017 11:51:07 +0000 (11:51 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 18 Jul 2017 11:51:07 +0000 (11:51 +0000)
1  2 
extraconfig/tasks/yum_update.sh patch | diff1 | diff2 | blob | history
puppet/services/openvswitch.yaml patch | diff1 | diff2 | blob | history

diff --cc extraconfig/tasks/yum_update.sh
Simple merge
diff --cc puppet/services/openvswitch.yaml
Simple merge