Merge "Cleanup templates from the shared CephCluster config"

author Jenkins <jenkins@review.openstack.org>

Tue, 26 Jul 2016 10:44:30 +0000 (10:44 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 26 Jul 2016 10:44:30 +0000 (10:44 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 26 Jul 2016 10:44:30 +0000 (10:44 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 26 Jul 2016 10:44:30 +0000 (10:44 +0000)
diff --cc overcloud-resource-registry-puppet.yaml
Simple merge
diff --cc overcloud.yaml
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 26 Jul 2016 10:44:30 +0000 (10:44 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 26 Jul 2016 10:44:30 +0000 (10:44 +0000)
		1	2
overcloud-resource-registry-puppet.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
overcloud.yaml	patch \|	diff1 \|	diff2 \|	blob \| history