Merge "Use 'deeper' hiera_hash merge behavior for all roles"
authorJenkins <jenkins@review.openstack.org>
Mon, 25 Apr 2016 19:20:15 +0000 (19:20 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 25 Apr 2016 19:20:15 +0000 (19:20 +0000)
1  2 
puppet/controller.yaml

Simple merge