Merge pull request #7951 from mjstapp/fix_cancel_event

author Donald Sharp <sharpd@cumulusnetworks.com>

Tue, 2 Mar 2021 12:21:47 +0000 (07:21 -0500)

committer GitHub <noreply@github.com>

Tue, 2 Mar 2021 12:21:47 +0000 (07:21 -0500)
author Donald Sharp <sharpd@cumulusnetworks.com>
Tue, 2 Mar 2021 12:21:47 +0000 (07:21 -0500)
committer GitHub <noreply@github.com>
Tue, 2 Mar 2021 12:21:47 +0000 (07:21 -0500)
diff --cc lib/thread.c
Simple merge
diff --cc lib/thread.h
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Tue, 2 Mar 2021 12:21:47 +0000 (07:21 -0500)
committer	GitHub <noreply@github.com>
	Tue, 2 Mar 2021 12:21:47 +0000 (07:21 -0500)
		1	2
lib/thread.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/thread.h	patch \|	diff1 \|	diff2 \|	blob \| history