From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 8 Jan 2015 14:39:31 +0000 (+0000)
Subject: Merge "Controller: Drive os-net-config via software conf"
X-Git-Tag: opnfv-6.0.0~2695
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e38535b528e3a611d5fe623b3e0212b88c48395e;p=apex-tripleo-heat-templates.git

Merge "Controller: Drive os-net-config via software conf"
---

e38535b528e3a611d5fe623b3e0212b88c48395e