Merge "Enable nova-api to run over httpd again"
authorJenkins <jenkins@review.openstack.org>
Thu, 29 Jun 2017 11:30:40 +0000 (11:30 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 29 Jun 2017 11:30:40 +0000 (11:30 +0000)

Trivial merge