Merge "Re-run gnocchi and ceilometer upgrade in step 5" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Wed, 29 Mar 2017 16:32:00 +0000 (16:32 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 29 Mar 2017 16:32:00 +0000 (16:32 +0000)

Trivial merge