Merge "Don't store Ceilo DB credentials on compute node"

author Jenkins <jenkins@review.openstack.org>

Thu, 8 Jan 2015 08:22:55 +0000 (08:22 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 8 Jan 2015 08:22:55 +0000 (08:22 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 8 Jan 2015 08:22:55 +0000 (08:22 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 8 Jan 2015 08:22:55 +0000 (08:22 +0000)
diff --cc compute-config.yaml
Simple merge
diff --cc compute.yaml
Simple merge
diff --cc nova-compute-instance.yaml
Simple merge
diff --cc overcloud-source.yaml
Simple merge
diff --cc overcloud-without-mergepy.yaml
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 8 Jan 2015 08:22:55 +0000 (08:22 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 8 Jan 2015 08:22:55 +0000 (08:22 +0000)
		1	2
compute-config.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
compute.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
nova-compute-instance.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
overcloud-source.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
overcloud-without-mergepy.yaml	patch \|	diff1 \|	diff2 \|	blob \| history