Merge "Update authtoken parameters to match recent changes"
authorJenkins <jenkins@review.openstack.org>
Thu, 25 Aug 2016 10:38:25 +0000 (10:38 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 25 Aug 2016 10:38:25 +0000 (10:38 +0000)
1  2 
puppet/controller.yaml

Simple merge