Merge pull request #10409 from idryzhov/zebra-mq-clean-crash

author Mark Stapp <mjs.ietf@gmail.com>

Wed, 2 Feb 2022 13:35:00 +0000 (08:35 -0500)

committer GitHub <noreply@github.com>

Wed, 2 Feb 2022 13:35:00 +0000 (08:35 -0500)
author Mark Stapp <mjs.ietf@gmail.com>
Wed, 2 Feb 2022 13:35:00 +0000 (08:35 -0500)
committer GitHub <noreply@github.com>
Wed, 2 Feb 2022 13:35:00 +0000 (08:35 -0500)
diff --cc zebra/rib.h
Simple merge
diff --cc zebra/zebra_rib.c
Simple merge
author	Mark Stapp <mjs.ietf@gmail.com>
	Wed, 2 Feb 2022 13:35:00 +0000 (08:35 -0500)
committer	GitHub <noreply@github.com>
	Wed, 2 Feb 2022 13:35:00 +0000 (08:35 -0500)
		1	2
zebra/rib.h	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_rib.c	patch \|	diff1 \|	diff2 \|	blob \| history