Merge "Enable Manila integration - as a composable controller service"
authorJenkins <jenkins@review.openstack.org>
Wed, 3 Aug 2016 16:16:24 +0000 (16:16 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 3 Aug 2016 16:16:24 +0000 (16:16 +0000)

Trivial merge