Merge "Pass hieradata relevant for httpd in the Heat APIs"
authorJenkins <jenkins@review.openstack.org>
Fri, 10 Mar 2017 20:48:25 +0000 (20:48 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 10 Mar 2017 20:48:25 +0000 (20:48 +0000)

Trivial merge