Merge "Add option to disable "d1" Swift device"
authorJenkins <jenkins@review.openstack.org>
Fri, 4 Nov 2016 13:24:39 +0000 (13:24 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 4 Nov 2016 13:24:39 +0000 (13:24 +0000)

Trivial merge