Merge "Support for external swift proxy"
authorJenkins <jenkins@review.openstack.org>
Tue, 18 Apr 2017 14:22:59 +0000 (14:22 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 18 Apr 2017 14:22:59 +0000 (14:22 +0000)

Trivial merge