Merge "Use httpd in Zaqar docker service"
authorJenkins <jenkins@review.openstack.org>
Wed, 10 May 2017 17:32:22 +0000 (17:32 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 10 May 2017 17:32:22 +0000 (17:32 +0000)

Trivial merge