Merge "Configures haproxy as a Pacemaker resource"
authorJenkins <jenkins@review.openstack.org>
Tue, 28 Apr 2015 13:55:42 +0000 (13:55 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 28 Apr 2015 13:55:42 +0000 (13:55 +0000)

Trivial merge