Merge "Add support for Cinder "NAS secure" driver params" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Thu, 15 Jun 2017 20:21:47 +0000 (20:21 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 15 Jun 2017 20:21:47 +0000 (20:21 +0000)

Trivial merge