Merge "Add rabbit.cookie attribute"

author Jenkins <jenkins@review.openstack.org>

Tue, 11 Mar 2014 05:51:41 +0000 (05:51 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 11 Mar 2014 05:51:41 +0000 (05:51 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 11 Mar 2014 05:51:41 +0000 (05:51 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 11 Mar 2014 05:51:41 +0000 (05:51 +0000)
diff --cc notcompute.yaml
Simple merge
diff --cc overcloud-source.yaml
Simple merge
diff --cc undercloud-source.yaml
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 11 Mar 2014 05:51:41 +0000 (05:51 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 11 Mar 2014 05:51:41 +0000 (05:51 +0000)
		1	2
notcompute.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
overcloud-source.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
undercloud-source.yaml	patch \|	diff1 \|	diff2 \|	blob \| history