Merge "puppet: allow config of ad-hoc Cinder settings"
authorJenkins <jenkins@review.openstack.org>
Sat, 23 Jan 2016 17:31:43 +0000 (17:31 +0000)
committerGerrit Code Review <review@openstack.org>
Sat, 23 Jan 2016 17:31:43 +0000 (17:31 +0000)

Trivial merge