Merge "Add retries to the ::pacemaker::stonith property"
authorJenkins <jenkins@review.openstack.org>
Tue, 24 Jan 2017 14:40:22 +0000 (14:40 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 24 Jan 2017 14:40:22 +0000 (14:40 +0000)

Trivial merge