From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 12 May 2017 03:06:32 +0000 (+0000)
Subject: Merge "Merge pre|post puppet resources into pre|post config." into stable/ocata
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=bdc175be26655580004af41b1fd2cfe612ebf953;p=apex-tripleo-heat-templates.git

Merge "Merge pre|post puppet resources into pre|post config." into stable/ocata
---

bdc175be26655580004af41b1fd2cfe612ebf953