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

Trivial merge