Merge "Fix legacy nova/cinder encryption key manager configuration"
authorJenkins <jenkins@review.openstack.org>
Mon, 14 Aug 2017 23:01:54 +0000 (23:01 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 14 Aug 2017 23:01:54 +0000 (23:01 +0000)

Trivial merge