Merge "Allow packer-merge job to test WIP patch"

author Thanh Ha (zxiiro) <thanh.ha@linuxfoundation.org>

Tue, 20 Nov 2018 01:30:52 +0000 (01:30 +0000)

committer Gerrit Code Review <gerrit@linuxfoundation.org>

Tue, 20 Nov 2018 01:30:52 +0000 (01:30 +0000)
author Thanh Ha (zxiiro) <thanh.ha@linuxfoundation.org>
Tue, 20 Nov 2018 01:30:52 +0000 (01:30 +0000)
committer Gerrit Code Review <gerrit@linuxfoundation.org>
Tue, 20 Nov 2018 01:30:52 +0000 (01:30 +0000)
diff --cc docs/jjb/lf-ci-jobs.rst
Simple merge
diff --cc jjb/lf-ci-jobs.yaml
Simple merge
author	Thanh Ha (zxiiro) <thanh.ha@linuxfoundation.org>
	Tue, 20 Nov 2018 01:30:52 +0000 (01:30 +0000)
committer	Gerrit Code Review <gerrit@linuxfoundation.org>
	Tue, 20 Nov 2018 01:30:52 +0000 (01:30 +0000)
		1	2
docs/jjb/lf-ci-jobs.rst	patch \|	diff1 \|	diff2 \|	blob \| history
jjb/lf-ci-jobs.yaml	patch \|	diff1 \|	diff2 \|	blob \| history