Merge "Add back Heat conditions in upgrade workflow"
authorJenkins <jenkins@review.openstack.org>
Wed, 3 May 2017 21:23:21 +0000 (21:23 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 3 May 2017 21:23:21 +0000 (21:23 +0000)

Trivial merge