Merge pull request #8237 from pguibert6WIND/nhrp_use_zebra_2

author Mark Stapp <mjs@voltanet.io>

Wed, 5 May 2021 11:57:04 +0000 (07:57 -0400)

committer GitHub <noreply@github.com>

Wed, 5 May 2021 11:57:04 +0000 (07:57 -0400)
author Mark Stapp <mjs@voltanet.io>
Wed, 5 May 2021 11:57:04 +0000 (07:57 -0400)
committer GitHub <noreply@github.com>
Wed, 5 May 2021 11:57:04 +0000 (07:57 -0400)
diff --cc lib/log.c
Simple merge
diff --cc zebra/if_netlink.c
Simple merge
diff --cc zebra/interface.c
Simple merge
diff --cc zebra/interface.h
Simple merge
author	Mark Stapp <mjs@voltanet.io>
	Wed, 5 May 2021 11:57:04 +0000 (07:57 -0400)
committer	GitHub <noreply@github.com>
	Wed, 5 May 2021 11:57:04 +0000 (07:57 -0400)
		1	2
lib/log.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/if_netlink.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/interface.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/interface.h	patch \|	diff1 \|	diff2 \|	blob \| history