Merge "Allow neutron_options customization for dashboard"
authorJenkins <jenkins@review.openstack.org>
Wed, 6 Jul 2016 15:39:17 +0000 (15:39 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 6 Jul 2016 15:39:17 +0000 (15:39 +0000)
commit77e5703b5f0cf687e3a550647347e2697f254b12
treefd87f4125dce6aa8509496f5c2954e688549c831
parent0fbe987ed46f0ddeaea05b5b5bcc56ae28b716d0
parent5e1229c75552df9bd0795a612650a1bc8a9fe8aa
Merge "Allow neutron_options customization for dashboard"
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp