Merge "Upgrades: object storage node upgrade fix"
authorJenkins <jenkins@review.openstack.org>
Thu, 10 Mar 2016 15:25:56 +0000 (15:25 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 10 Mar 2016 15:25:56 +0000 (15:25 +0000)

Trivial merge