Merge "Fix MidoNet errors"
authorJenkins <jenkins@review.openstack.org>
Tue, 9 Feb 2016 08:52:30 +0000 (08:52 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 9 Feb 2016 08:52:30 +0000 (08:52 +0000)
commit3bd5d13c535e99519f114f6daa1537c760f1ad8d
tree92c1984a5209c159046219c08ebefba1398f9c61
parentff4108c158fd3bc5128bdc1f1c5bc480de604ad9
parentb2593e0722925c733128af41ae0d0b9925d035de
Merge "Fix MidoNet errors"
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp