Merge "Composable opencontrail plugin"
authorJenkins <jenkins@review.openstack.org>
Thu, 23 Jun 2016 03:58:25 +0000 (03:58 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 23 Jun 2016 03:58:25 +0000 (03:58 +0000)
commit23ec8e1509717bb230f77096d3892812f3e67c14
tree047c18b0da5cfbdd743989741d8d4df022794173
parentf32de519adb072ee5ca38b01044f983ac4437444
parent37bb689a0fe37e9365373dbd47291a4323d36bd7
Merge "Composable opencontrail plugin"
overcloud-resource-registry-puppet.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp