Merge pull request #7472 from opensourcerouting/fpm-fixes

author Mark Stapp <mjs@voltanet.io>

Tue, 22 Dec 2020 16:37:58 +0000 (11:37 -0500)

committer GitHub <noreply@github.com>

Tue, 22 Dec 2020 16:37:58 +0000 (11:37 -0500)
author Mark Stapp <mjs@voltanet.io>
Tue, 22 Dec 2020 16:37:58 +0000 (11:37 -0500)
committer GitHub <noreply@github.com>
Tue, 22 Dec 2020 16:37:58 +0000 (11:37 -0500)
diff --cc tools/frr-reload.py
Simple merge
diff --cc zebra/dplane_fpm_nl.c
Simple merge
author	Mark Stapp <mjs@voltanet.io>
	Tue, 22 Dec 2020 16:37:58 +0000 (11:37 -0500)
committer	GitHub <noreply@github.com>
	Tue, 22 Dec 2020 16:37:58 +0000 (11:37 -0500)
		1	2
tools/frr-reload.py	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/dplane_fpm_nl.c	patch \|	diff1 \|	diff2 \|	blob \| history