From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 22 Jan 2016 21:56:10 +0000 (+0000)
Subject: Merge "puppet: allow config of ad-hoc Heat settings"
X-Git-Tag: opnfv-6.0.0~2211
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=56bc8272b3c07142ff1aa47685de9ec7ce2ffe89;p=apex-tripleo-heat-templates.git

Merge "puppet: allow config of ad-hoc Heat settings"
---

56bc8272b3c07142ff1aa47685de9ec7ce2ffe89