Merge "Convert Swift ringbuilder to composable services format"

author Jenkins <jenkins@review.openstack.org>

Mon, 25 Jul 2016 15:58:33 +0000 (15:58 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 25 Jul 2016 15:58:33 +0000 (15:58 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 25 Jul 2016 15:58:33 +0000 (15:58 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 25 Jul 2016 15:58:33 +0000 (15:58 +0000)
diff --cc overcloud.yaml
Simple merge
diff --cc puppet/controller.yaml
Simple merge
diff --cc puppet/swift-storage.yaml
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 25 Jul 2016 15:58:33 +0000 (15:58 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 25 Jul 2016 15:58:33 +0000 (15:58 +0000)
		1	2
overcloud.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/controller.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/swift-storage.yaml	patch \|	diff1 \|	diff2 \|	blob \| history