Merge pull request #7210 from idryzhov/route-types-disable-daemon

author Donald Sharp <sharpd@cumulusnetworks.com>

Thu, 19 Nov 2020 00:38:14 +0000 (19:38 -0500)

committer GitHub <noreply@github.com>

Thu, 19 Nov 2020 00:38:14 +0000 (19:38 -0500)
author Donald Sharp <sharpd@cumulusnetworks.com>
Thu, 19 Nov 2020 00:38:14 +0000 (19:38 -0500)
committer GitHub <noreply@github.com>
Thu, 19 Nov 2020 00:38:14 +0000 (19:38 -0500)
diff --cc configure.ac
Simple merge
diff --cc lib/subdir.am
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Thu, 19 Nov 2020 00:38:14 +0000 (19:38 -0500)
committer	GitHub <noreply@github.com>
	Thu, 19 Nov 2020 00:38:14 +0000 (19:38 -0500)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
lib/subdir.am	patch \|	diff1 \|	diff2 \|	blob \| history