Merge "Bring back (abandoned) support for Cinder/NFS"
authorJenkins <jenkins@review.openstack.org>
Thu, 8 Jan 2015 08:50:15 +0000 (08:50 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 8 Jan 2015 08:50:15 +0000 (08:50 +0000)

Trivial merge