Merge "Drop extraconfig for neutron-opencontrail.yaml"
authorJenkins <jenkins@review.openstack.org>
Thu, 23 Jun 2016 04:00:25 +0000 (04:00 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 23 Jun 2016 04:00:25 +0000 (04:00 +0000)
1  2 
puppet/controller.yaml

Simple merge