Merge "Add parameters to run nova over httpd"
authorJenkins <jenkins@review.openstack.org>
Wed, 12 Oct 2016 16:42:24 +0000 (16:42 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 12 Oct 2016 16:42:24 +0000 (16:42 +0000)

Trivial merge