Merge "Use clouds.yaml for openstack packer builders"

author Anil Belur <abelur@linuxfoundation.org>

Thu, 13 Sep 2018 15:56:24 +0000 (15:56 +0000)

committer Gerrit Code Review <gerrit@linuxfoundation.org>

Thu, 13 Sep 2018 15:56:24 +0000 (15:56 +0000)
author Anil Belur <abelur@linuxfoundation.org>
Thu, 13 Sep 2018 15:56:24 +0000 (15:56 +0000)
committer Gerrit Code Review <gerrit@linuxfoundation.org>
Thu, 13 Sep 2018 15:56:24 +0000 (15:56 +0000)
diff --cc docs/jjb/lf-macros.rst
Simple merge
diff --cc jjb/lf-macros.yaml
Simple merge
author	Anil Belur <abelur@linuxfoundation.org>
	Thu, 13 Sep 2018 15:56:24 +0000 (15:56 +0000)
committer	Gerrit Code Review <gerrit@linuxfoundation.org>
	Thu, 13 Sep 2018 15:56:24 +0000 (15:56 +0000)
		1	2
docs/jjb/lf-macros.rst	patch \|	diff1 \|	diff2 \|	blob \| history
jjb/lf-macros.yaml	patch \|	diff1 \|	diff2 \|	blob \| history