Merge "Optimize Nova disk_cachemodes and hw_disk_discard options for RBD"
authorJenkins <jenkins@review.openstack.org>
Wed, 25 May 2016 07:20:15 +0000 (07:20 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 25 May 2016 07:20:15 +0000 (07:20 +0000)

Trivial merge