Merge "Support for external swift proxy"
authorJenkins <jenkins@review.openstack.org>
Mon, 17 Apr 2017 18:06:40 +0000 (18:06 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 17 Apr 2017 18:06:41 +0000 (18:06 +0000)

Trivial merge