From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 2 Sep 2016 16:50:38 +0000 (+0000)
Subject: Merge "Ironic: enabled_services moved from ironic to ironic::conductor manifest"
X-Git-Tag: opnfv-6.0.0~1663
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7282a6db92f4904902628cf07854b6f9edd2c2e2;p=apex-tripleo-heat-templates.git

Merge "Ironic: enabled_services moved from ironic to ironic::conductor manifest"
---

7282a6db92f4904902628cf07854b6f9edd2c2e2