Merge "Enable trust anchor injection"
authorJenkins <jenkins@review.openstack.org>
Wed, 25 Nov 2015 17:58:58 +0000 (17:58 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 25 Nov 2015 17:58:58 +0000 (17:58 +0000)
1  2 
puppet/controller.yaml

Simple merge