From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 15 May 2015 09:07:21 +0000 (+0000)
Subject: Merge "Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker"
X-Git-Tag: opnfv-6.0.0~2585
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9ce06559bc32c279e0905472f29def58abf5eda0;p=apex-tripleo-heat-templates.git

Merge "Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker"
---

9ce06559bc32c279e0905472f29def58abf5eda0