Merge pull request #5918 from ton31337/fix/__func__everywhere

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

Thu, 5 Mar 2020 22:37:03 +0000 (17:37 -0500)

committer GitHub <noreply@github.com>

Thu, 5 Mar 2020 22:37:03 +0000 (17:37 -0500)
author Quentin Young <qlyoung@users.noreply.github.com>
Thu, 5 Mar 2020 22:37:03 +0000 (17:37 -0500)
committer GitHub <noreply@github.com>
Thu, 5 Mar 2020 22:37:03 +0000 (17:37 -0500)
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
diff --cc zebra/zebra_rnh.c
Simple merge
author	Quentin Young <qlyoung@users.noreply.github.com>
	Thu, 5 Mar 2020 22:37:03 +0000 (17:37 -0500)
committer	GitHub <noreply@github.com>
	Thu, 5 Mar 2020 22:37:03 +0000 (17:37 -0500)
		1	2
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_rnh.c	patch \|	diff1 \|	diff2 \|	blob \| history