Merge "M/N upgrade sahara-api fails to restart."
authorJenkins <jenkins@review.openstack.org>
Sat, 17 Sep 2016 19:57:02 +0000 (19:57 +0000)
committerGerrit Code Review <review@openstack.org>
Sat, 17 Sep 2016 19:57:02 +0000 (19:57 +0000)

Trivial merge