Merge "Fix cinder error when CinderNfsMountOptions option is absent"
authorJenkins <jenkins@review.openstack.org>
Fri, 13 Nov 2015 18:46:51 +0000 (18:46 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 13 Nov 2015 18:46:51 +0000 (18:46 +0000)

Trivial merge