Merge pull request #9304 from donaldsharp/zebra_random_stuff

author Mark Stapp <mjs@voltanet.io>

Thu, 12 Aug 2021 14:16:46 +0000 (10:16 -0400)

committer GitHub <noreply@github.com>

Thu, 12 Aug 2021 14:16:46 +0000 (10:16 -0400)
author Mark Stapp <mjs@voltanet.io>
Thu, 12 Aug 2021 14:16:46 +0000 (10:16 -0400)
committer GitHub <noreply@github.com>
Thu, 12 Aug 2021 14:16:46 +0000 (10:16 -0400)
diff --cc zebra/rib.h
Simple merge
diff --cc zebra/zebra_rib.c
Simple merge
author	Mark Stapp <mjs@voltanet.io>
	Thu, 12 Aug 2021 14:16:46 +0000 (10:16 -0400)
committer	GitHub <noreply@github.com>
	Thu, 12 Aug 2021 14:16:46 +0000 (10:16 -0400)
		1	2
zebra/rib.h	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_rib.c	patch \|	diff1 \|	diff2 \|	blob \| history