Merge "Swift proxy align *-quotas with puppet-swift syntax"
authorJenkins <jenkins@review.openstack.org>
Fri, 20 Jan 2017 07:30:03 +0000 (07:30 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 20 Jan 2017 07:30:03 +0000 (07:30 +0000)

Trivial merge