Merge "Combine BootstrapNodeDeployment with AllNodesDeployment"

author Jenkins <jenkins@review.openstack.org>

Tue, 12 Jul 2016 18:36:04 +0000 (18:36 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 12 Jul 2016 18:36:04 +0000 (18:36 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 12 Jul 2016 18:36:04 +0000 (18:36 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 12 Jul 2016 18:36:04 +0000 (18:36 +0000)
diff --cc overcloud-resource-registry-puppet.yaml
Simple merge
diff --cc overcloud.yaml
Simple merge
diff --cc puppet/ceph-storage.yaml
Simple merge
diff --cc puppet/cinder-storage.yaml
Simple merge
diff --cc puppet/swift-storage.yaml
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 12 Jul 2016 18:36:04 +0000 (18:36 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 12 Jul 2016 18:36:04 +0000 (18:36 +0000)
		1	2
overcloud-resource-registry-puppet.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
overcloud.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/ceph-storage.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/cinder-storage.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/swift-storage.yaml	patch \|	diff1 \|	diff2 \|	blob \| history