Merge pull request #6247 from FRRouting/nb_conversions

author Donald Sharp <sharpd@cumulusnetworks.com>

Thu, 16 Apr 2020 23:39:14 +0000 (19:39 -0400)

committer GitHub <noreply@github.com>

Thu, 16 Apr 2020 23:39:14 +0000 (19:39 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Thu, 16 Apr 2020 23:39:14 +0000 (19:39 -0400)
committer GitHub <noreply@github.com>
Thu, 16 Apr 2020 23:39:14 +0000 (19:39 -0400)
diff --cc bfdd/bfdd.c
Simple merge
diff --cc ldpd/ldpd.c
Simple merge
diff --cc lib/subdir.am
Simple merge
diff --cc lib/vrf.c
Simple merge
diff --cc zebra/interface.c
Simple merge
diff --cc zebra/zebra_vty.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Thu, 16 Apr 2020 23:39:14 +0000 (19:39 -0400)
committer	GitHub <noreply@github.com>
	Thu, 16 Apr 2020 23:39:14 +0000 (19:39 -0400)
		1	2
bfdd/bfdd.c	patch \|	diff1 \|	diff2 \|	blob \| history
ldpd/ldpd.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/subdir.am	patch \|	diff1 \|	diff2 \|	blob \| history
lib/vrf.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/interface.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history