Merge "Allow option to disable Swift ring management"
authorJenkins <jenkins@review.openstack.org>
Mon, 21 Mar 2016 17:43:42 +0000 (17:43 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 21 Mar 2016 17:43:42 +0000 (17:43 +0000)
1  2 
puppet/controller.yaml

Simple merge