Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: c57543b 223733c)
Merge "Stop Heat WSGI services on docker upgrade"
authorJenkins <jenkins@review.openstack.org>
Wed, 26 Jul 2017 13:47:21 +0000 (13:47 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 26 Jul 2017 13:47:21 +0000 (13:47 +0000)
1  2 
docker/services/heat-api.yaml patch | diff1 | diff2 | blob | history
puppet/services/heat-api-cfn.yaml patch | diff1 | diff2 | blob | history

diff --cc docker/services/heat-api.yaml
Simple merge
diff --cc puppet/services/heat-api-cfn.yaml
Simple merge