From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 25 Aug 2016 22:08:33 +0000 (+0000)
Subject: Merge "Adding optional aci-opflex hiera data"
X-Git-Tag: opnfv-6.0.0~1716
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=60f528f277bfb07e9107f60684d8f0f537f4c760;p=apex-tripleo-heat-templates.git

Merge "Adding optional aci-opflex hiera data"
---

60f528f277bfb07e9107f60684d8f0f537f4c760