Merge "Rework gnocchi-upgrade to run in a separate upgrade step"
authorJenkins <jenkins@review.openstack.org>
Thu, 3 Nov 2016 17:28:58 +0000 (17:28 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 3 Nov 2016 17:28:58 +0000 (17:28 +0000)

Trivial merge