From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 8 Jul 2015 13:04:09 +0000 (+0000)
Subject: Merge "Wire in Controller pre-deployment extraconfig"
X-Git-Tag: opnfv-6.0.0~2448
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=82f04ec310fe9d4f99e46077bb1c6e439187c7ed;p=apex-tripleo-heat-templates.git

Merge "Wire in Controller pre-deployment extraconfig"
---

82f04ec310fe9d4f99e46077bb1c6e439187c7ed