From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 17 Jan 2017 11:11:51 +0000 (+0000)
Subject: Merge "Remove old ControllerConfig override from puppet-pacemaker.yaml"
X-Git-Tag: opnfv-6.0.0~1234
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2e3ff0a6734bce712ab11f37a9dc2454f1420d76;p=apex-tripleo-heat-templates.git

Merge "Remove old ControllerConfig override from puppet-pacemaker.yaml"
---

2e3ff0a6734bce712ab11f37a9dc2454f1420d76