Merge "Disable glance registry during upgrade"
authorJenkins <jenkins@review.openstack.org>
Thu, 19 Jan 2017 18:03:32 +0000 (18:03 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 19 Jan 2017 18:03:32 +0000 (18:03 +0000)

Trivial merge