Merge "Enable Cisco N1KV driver"
authorJenkins <jenkins@review.openstack.org>
Wed, 7 Oct 2015 07:23:17 +0000 (07:23 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 7 Oct 2015 07:23:17 +0000 (07:23 +0000)
1  2 
puppet/compute.yaml
puppet/controller.yaml
puppet/manifests/overcloud_compute.pp
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp

Simple merge
Simple merge
Simple merge