Merge pull request #4449 from opensourcerouting/py-detect

author Donald Sharp <sharpd@cumulusnetworks.com>

Fri, 7 Jun 2019 11:19:35 +0000 (07:19 -0400)

committer GitHub <noreply@github.com>

Fri, 7 Jun 2019 11:19:35 +0000 (07:19 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Fri, 7 Jun 2019 11:19:35 +0000 (07:19 -0400)
committer GitHub <noreply@github.com>
Fri, 7 Jun 2019 11:19:35 +0000 (07:19 -0400)
diff --cc configure.ac
Simple merge
diff --cc tests/subdir.am
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Fri, 7 Jun 2019 11:19:35 +0000 (07:19 -0400)
committer	GitHub <noreply@github.com>
	Fri, 7 Jun 2019 11:19:35 +0000 (07:19 -0400)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
tests/subdir.am	patch \|	diff1 \|	diff2 \|	blob \| history