Merge "M/N upgrade fail to restart nova-scheduler."
authorJenkins <jenkins@review.openstack.org>
Fri, 26 Aug 2016 23:18:37 +0000 (23:18 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 26 Aug 2016 23:18:37 +0000 (23:18 +0000)

Trivial merge