Merge "Migrate Swift ring handling from tripleo-heat-templates to puppet-tripleo...
authorJenkins <jenkins@review.openstack.org>
Wed, 19 Apr 2017 08:01:38 +0000 (08:01 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 19 Apr 2017 08:01:38 +0000 (08:01 +0000)

Trivial merge