Merge "Add python templates to run tox on merge"

author Aric Gardner <agardner@linuxfoundation.org>

Wed, 11 Sep 2019 15:22:00 +0000 (15:22 +0000)

committer Gerrit Code Review <gerrit@linuxfoundation.org>

Wed, 11 Sep 2019 15:22:00 +0000 (15:22 +0000)
author Aric Gardner <agardner@linuxfoundation.org>
Wed, 11 Sep 2019 15:22:00 +0000 (15:22 +0000)
committer Gerrit Code Review <gerrit@linuxfoundation.org>
Wed, 11 Sep 2019 15:22:00 +0000 (15:22 +0000)
diff --cc docs/jjb/lf-python-jobs.rst
Simple merge
diff --cc jjb/lf-python-jobs.yaml
Simple merge
author	Aric Gardner <agardner@linuxfoundation.org>
	Wed, 11 Sep 2019 15:22:00 +0000 (15:22 +0000)
committer	Gerrit Code Review <gerrit@linuxfoundation.org>
	Wed, 11 Sep 2019 15:22:00 +0000 (15:22 +0000)
		1	2
docs/jjb/lf-python-jobs.rst	patch \|	diff1 \|	diff2 \|	blob \| history
jjb/lf-python-jobs.yaml	patch \|	diff1 \|	diff2 \|	blob \| history