From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 3 Feb 2017 21:41:31 +0000 (+0000)
Subject: Merge "Simplify/fix config enabled conditions for upgrades"
X-Git-Tag: opnfv-6.0.0~1125
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3aff42dde21c19247961b78f07e9b5b2cc1e8f00;p=apex-tripleo-heat-templates.git

Merge "Simplify/fix config enabled conditions for upgrades"
---

3aff42dde21c19247961b78f07e9b5b2cc1e8f00