Merge "Fix manila-api volumes list"
authorJenkins <jenkins@review.openstack.org>
Fri, 23 Jun 2017 21:57:37 +0000 (21:57 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 23 Jun 2017 21:57:37 +0000 (21:57 +0000)

Trivial merge