From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 21 Mar 2017 10:40:05 +0000 (+0000)
Subject: Merge "Keep existing data for containerized ironic-conductor"
X-Git-Tag: opnfv-6.0.0~888
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e0bd63c826e687d9019b76297e9375f3b0608c2e;p=apex-tripleo-heat-templates.git

Merge "Keep existing data for containerized ironic-conductor"
---

e0bd63c826e687d9019b76297e9375f3b0608c2e