Merge "Allow the override of pacemaker::corosync::settle_tries"
authorJenkins <jenkins@review.openstack.org>
Thu, 2 Feb 2017 15:16:16 +0000 (15:16 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 2 Feb 2017 15:16:16 +0000 (15:16 +0000)

Trivial merge