Merge "Update Dell Storage Center api port setting"

author Jenkins <jenkins@review.openstack.org>

Mon, 15 Feb 2016 22:47:19 +0000 (22:47 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 15 Feb 2016 22:47:19 +0000 (22:47 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 15 Feb 2016 22:47:19 +0000 (22:47 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 15 Feb 2016 22:47:19 +0000 (22:47 +0000)
diff --cc puppet/manifests/overcloud_controller.pp
Simple merge
diff --cc puppet/manifests/overcloud_controller_pacemaker.pp
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 15 Feb 2016 22:47:19 +0000 (22:47 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 15 Feb 2016 22:47:19 +0000 (22:47 +0000)
		1	2
puppet/manifests/overcloud_controller.pp	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/manifests/overcloud_controller_pacemaker.pp	patch \|	diff1 \|	diff2 \|	blob \| history