Merge "Fix wrong keypair parameter description"

author Jenkins <jenkins@review.openstack.org>

Mon, 14 Dec 2015 22:48:51 +0000 (22:48 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 14 Dec 2015 22:48:51 +0000 (22:48 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 14 Dec 2015 22:48:51 +0000 (22:48 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 14 Dec 2015 22:48:51 +0000 (22:48 +0000)
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/compute.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, 14 Dec 2015 22:48:51 +0000 (22:48 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 14 Dec 2015 22:48:51 +0000 (22:48 +0000)
		1	2
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/compute.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/controller.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/swift-storage.yaml	patch \|	diff1 \|	diff2 \|	blob \| history