From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 24 Apr 2017 18:42:00 +0000 (+0000)
Subject: Merge "Merge pre|post puppet resources into pre|post config."
X-Git-Tag: opnfv-6.0.0~736
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b364c5eb9dab93e3fb5f3bb329ee27bca32e985c;p=apex-tripleo-heat-templates.git

Merge "Merge pre|post puppet resources into pre|post config."
---

b364c5eb9dab93e3fb5f3bb329ee27bca32e985c