Merge "Use httpd in Zaqar docker service"
authorJenkins <jenkins@review.openstack.org>
Wed, 12 Apr 2017 16:39:40 +0000 (16:39 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 12 Apr 2017 16:39:40 +0000 (16:39 +0000)

Trivial merge