Merge "Remove ::nova::network::neutron, now in puppet-tripleo"
authorJenkins <jenkins@review.openstack.org>
Tue, 21 Jun 2016 13:22:35 +0000 (13:22 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 21 Jun 2016 13:22:35 +0000 (13:22 +0000)
commita7e30686903d0fa9430435c527b9fd4de1d0bb19
treec4d29c1b9cf6afdc7d56203b1201904dbaa77956
parenta5399e2310e666ba5489aeccd56e810108e79d96
parentca11c3d1c1e3837410cef8365239e338a6f5879c
Merge "Remove ::nova::network::neutron, now in puppet-tripleo"
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp