Merge "Fix the timeout for pacemaker systemd resources"
authorJenkins <jenkins@review.openstack.org>
Tue, 4 Oct 2016 09:12:27 +0000 (09:12 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 4 Oct 2016 09:12:27 +0000 (09:12 +0000)

Trivial merge