Merge "Add support for Glance RBD backend"

author Jenkins <jenkins@review.openstack.org>

Mon, 4 May 2015 16:49:08 +0000 (16:49 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 4 May 2015 16:49:08 +0000 (16:49 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 4 May 2015 16:49:08 +0000 (16:49 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 4 May 2015 16:49:08 +0000 (16:49 +0000)
diff --cc controller.yaml
Simple merge
diff --cc overcloud-without-mergepy.yaml
Simple merge
diff --cc puppet/controller-puppet.yaml
Simple merge
diff --cc puppet/manifests/overcloud_controller.pp
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 4 May 2015 16:49:08 +0000 (16:49 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 4 May 2015 16:49:08 +0000 (16:49 +0000)
		1	2
controller.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
overcloud-without-mergepy.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/controller-puppet.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/manifests/overcloud_controller.pp	patch \|	diff1 \|	diff2 \|	blob \| history