Merge "Use httpd in Heat docker services"
authorJenkins <jenkins@review.openstack.org>
Thu, 4 May 2017 13:44:35 +0000 (13:44 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 4 May 2017 13:44:35 +0000 (13:44 +0000)

Trivial merge