Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: bb963cf 501f35a)
Merge "Disable env evaluation in workflow executions"
authorJenkins <jenkins@review.openstack.org>
Sat, 22 Jul 2017 08:18:14 +0000 (08:18 +0000)
committerGerrit Code Review <review@openstack.org>
Sat, 22 Jul 2017 08:18:14 +0000 (08:18 +0000)
1  2 
docker/docker-steps.j2 patch | diff1 | diff2 | blob | history
puppet/puppet-steps.j2 patch | diff1 | diff2 | blob | history

diff --cc docker/docker-steps.j2
Simple merge
diff --cc puppet/puppet-steps.j2
Simple merge