Merge "Add ControlPlaneNetwork to vip.yaml"
authorJenkins <jenkins@review.openstack.org>
Mon, 6 Jul 2015 16:54:33 +0000 (16:54 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 6 Jul 2015 16:54:33 +0000 (16:54 +0000)

Trivial merge