Merge "Allow Glance API and Registry to be split"
authorJenkins <jenkins@review.openstack.org>
Wed, 12 Oct 2016 19:32:19 +0000 (19:32 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 12 Oct 2016 19:32:19 +0000 (19:32 +0000)

Trivial merge