From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 14 Jul 2017 17:10:17 +0000 (+0000)
Subject: Merge "Support deprecated controllerExtraConfig naming in role template"
X-Git-Tag: opnfv-6.0.0~398
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=66e1d882505a3335e290d1943a2d2b15909fd73f;p=apex-tripleo-heat-templates.git

Merge "Support deprecated controllerExtraConfig naming in role template"
---

66e1d882505a3335e290d1943a2d2b15909fd73f