Merge "N->O upgrade, fix wrong parameters to nova placement." into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Fri, 21 Apr 2017 03:39:48 +0000 (03:39 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 21 Apr 2017 03:39:48 +0000 (03:39 +0000)

Trivial merge