Merge "Disable SwiftDispersion when using docker" into stable/pike
authorZuul <zuul@review.openstack.org>
Tue, 24 Oct 2017 10:16:14 +0000 (10:16 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 24 Oct 2017 10:16:14 +0000 (10:16 +0000)

Trivial merge