Merge "Escape ceph capabilities for manila client" into stable/pike
authorJenkins <jenkins@review.openstack.org>
Wed, 6 Sep 2017 08:59:22 +0000 (08:59 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 6 Sep 2017 08:59:22 +0000 (08:59 +0000)

Trivial merge