Merge "puppet: allow config of ad-hoc Glance settings"
authorJenkins <jenkins@review.openstack.org>
Fri, 22 Jan 2016 21:56:00 +0000 (21:56 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 22 Jan 2016 21:56:00 +0000 (21:56 +0000)

Trivial merge