Merge "N->O upgrade, fix wrong parameters to nova placement."
authorJenkins <jenkins@review.openstack.org>
Thu, 20 Apr 2017 09:34:46 +0000 (09:34 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 20 Apr 2017 09:34:46 +0000 (09:34 +0000)

Trivial merge