Merge pull request #7777 from volta-networks/fix_zebra_rib_c++

author Quentin Young <qlyoung@users.noreply.github.com>

Tue, 29 Dec 2020 16:07:12 +0000 (11:07 -0500)

committer GitHub <noreply@github.com>

Tue, 29 Dec 2020 16:07:12 +0000 (11:07 -0500)
author Quentin Young <qlyoung@users.noreply.github.com>
Tue, 29 Dec 2020 16:07:12 +0000 (11:07 -0500)
committer GitHub <noreply@github.com>
Tue, 29 Dec 2020 16:07:12 +0000 (11:07 -0500)
diff --cc zebra/rib.h
Simple merge
diff --cc zebra/zebra_rib.c
Simple merge
author	Quentin Young <qlyoung@users.noreply.github.com>
	Tue, 29 Dec 2020 16:07:12 +0000 (11:07 -0500)
committer	GitHub <noreply@github.com>
	Tue, 29 Dec 2020 16:07:12 +0000 (11:07 -0500)
		1	2
zebra/rib.h	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_rib.c	patch \|	diff1 \|	diff2 \|	blob \| history