From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 19 May 2015 15:54:29 +0000 (+0000)
Subject: Merge "Update to reflect puppet-pacemaker changes"
X-Git-Tag: opnfv-6.0.0~2581
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=96282af0a5facdc3c1f8e2083a608875946dfe09;p=apex-tripleo-heat-templates.git

Merge "Update to reflect puppet-pacemaker changes"
---

96282af0a5facdc3c1f8e2083a608875946dfe09