Merge "Contrail: Fix controlplane/dataplane network asignments & enable optional...
authorJenkins <jenkins@review.openstack.org>
Fri, 14 Jul 2017 23:44:24 +0000 (23:44 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 14 Jul 2017 23:44:24 +0000 (23:44 +0000)
1  2 
manifests/haproxy.pp

Simple merge