Merge "Add a type for the ControlVirtualIP resource"
authorJenkins <jenkins@review.openstack.org>
Mon, 19 Dec 2016 15:05:02 +0000 (15:05 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 19 Dec 2016 15:05:02 +0000 (15:05 +0000)

Trivial merge