Merge "Fix race during major-upgrade-pacemaker step"
authorJenkins <jenkins@review.openstack.org>
Thu, 10 Nov 2016 19:00:08 +0000 (19:00 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 10 Nov 2016 19:00:08 +0000 (19:00 +0000)

Trivial merge