Merge "Retry ceilometer-upgrade"
authorJenkins <jenkins@review.openstack.org>
Tue, 18 Jul 2017 01:49:41 +0000 (01:49 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 18 Jul 2017 01:49:41 +0000 (01:49 +0000)

Trivial merge