Merge pull request #6698 from deastoe/fpm-netlink-fixes

author Donald Sharp <sharpd@cumulusnetworks.com>

Tue, 4 Aug 2020 19:59:51 +0000 (15:59 -0400)

committer GitHub <noreply@github.com>

Tue, 4 Aug 2020 19:59:51 +0000 (15:59 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Tue, 4 Aug 2020 19:59:51 +0000 (15:59 -0400)
committer GitHub <noreply@github.com>
Tue, 4 Aug 2020 19:59:51 +0000 (15:59 -0400)
diff --cc zebra/rib.h
Simple merge
diff --cc zebra/zebra_fpm_netlink.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Tue, 4 Aug 2020 19:59:51 +0000 (15:59 -0400)
committer	GitHub <noreply@github.com>
	Tue, 4 Aug 2020 19:59:51 +0000 (15:59 -0400)
		1	2
zebra/rib.h	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_fpm_netlink.c	patch \|	diff1 \|	diff2 \|	blob \| history