Merge "Run Zaqar with httpd in puppet service"
authorJenkins <jenkins@review.openstack.org>
Mon, 24 Apr 2017 13:02:34 +0000 (13:02 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 24 Apr 2017 13:02:34 +0000 (13:02 +0000)

Trivial merge