Merge "Don't run ceilometer-upgrade via upgrade_tasks"
authorJenkins <jenkins@review.openstack.org>
Thu, 2 Feb 2017 10:34:11 +0000 (10:34 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 2 Feb 2017 10:34:11 +0000 (10:34 +0000)

Trivial merge