Merge pull request #8068 from qlyoung/bmp-tracing

author Russ White <russ@riw.us>

Wed, 17 Feb 2021 17:59:56 +0000 (12:59 -0500)

committer GitHub <noreply@github.com>

Wed, 17 Feb 2021 17:59:56 +0000 (12:59 -0500)
author Russ White <russ@riw.us>
Wed, 17 Feb 2021 17:59:56 +0000 (12:59 -0500)
committer GitHub <noreply@github.com>
Wed, 17 Feb 2021 17:59:56 +0000 (12:59 -0500)
diff --cc bgpd/bgp_bmp.c
Simple merge
diff --cc bgpd/bgpd.h
Simple merge
author	Russ White <russ@riw.us>
	Wed, 17 Feb 2021 17:59:56 +0000 (12:59 -0500)
committer	GitHub <noreply@github.com>
	Wed, 17 Feb 2021 17:59:56 +0000 (12:59 -0500)
		1	2
bgpd/bgp_bmp.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.h	patch \|	diff1 \|	diff2 \|	blob \| history