Merge "Disable stonith temporarily during upgrades"
authorJenkins <jenkins@review.openstack.org>
Wed, 29 Jun 2016 13:17:10 +0000 (13:17 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 29 Jun 2016 13:17:10 +0000 (13:17 +0000)

Trivial merge