Merge "Add enable_tunneling to swift storage metadata"
authorJenkins <jenkins@review.openstack.org>
Mon, 7 Apr 2014 20:31:32 +0000 (20:31 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 7 Apr 2014 20:31:32 +0000 (20:31 +0000)

Trivial merge