Merge pull request #9846 from idryzhov/lib-zebra-netns

author Mark Stapp <mjs@voltanet.io>

Tue, 26 Oct 2021 16:50:26 +0000 (12:50 -0400)

committer GitHub <noreply@github.com>

Tue, 26 Oct 2021 16:50:26 +0000 (12:50 -0400)
author Mark Stapp <mjs@voltanet.io>
Tue, 26 Oct 2021 16:50:26 +0000 (12:50 -0400)
committer GitHub <noreply@github.com>
Tue, 26 Oct 2021 16:50:26 +0000 (12:50 -0400)
diff --cc lib/vrf.c
Simple merge
diff --cc zebra/zebra_netns_notify.c
Simple merge
author	Mark Stapp <mjs@voltanet.io>
	Tue, 26 Oct 2021 16:50:26 +0000 (12:50 -0400)
committer	GitHub <noreply@github.com>
	Tue, 26 Oct 2021 16:50:26 +0000 (12:50 -0400)
		1	2
lib/vrf.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_netns_notify.c	patch \|	diff1 \|	diff2 \|	blob \| history