Merge "Minor fixes to TLS related resources"
authorJenkins <jenkins@review.openstack.org>
Thu, 3 Dec 2015 18:27:04 +0000 (18:27 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 3 Dec 2015 18:27:04 +0000 (18:27 +0000)
1  2 
puppet/controller.yaml

Simple merge