From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 19 Dec 2016 15:05:02 +0000 (+0000)
Subject: Merge "Add a type for the ControlVirtualIP resource"
X-Git-Tag: opnfv-6.0.0~1317
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=299c30192535573f7f515a575f13782a1e8fdf82;p=apex-tripleo-heat-templates.git

Merge "Add a type for the ControlVirtualIP resource"
---

299c30192535573f7f515a575f13782a1e8fdf82