Merge "Add major-upgrade-converge environment."
authorJenkins <jenkins@review.openstack.org>
Thu, 16 Feb 2017 09:36:44 +0000 (09:36 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 16 Feb 2017 09:36:44 +0000 (09:36 +0000)

Trivial merge