Merge "Enable object versioning in Swift proxy"
authorJenkins <jenkins@review.openstack.org>
Thu, 13 Oct 2016 20:17:15 +0000 (20:17 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 13 Oct 2016 20:17:15 +0000 (20:17 +0000)

Trivial merge