Merge pull request #11582 from liwg06/master

author Russ White <russ@riw.us>

Tue, 26 Jul 2022 13:20:45 +0000 (09:20 -0400)

committer GitHub <noreply@github.com>

Tue, 26 Jul 2022 13:20:45 +0000 (09:20 -0400)
author Russ White <russ@riw.us>
Tue, 26 Jul 2022 13:20:45 +0000 (09:20 -0400)
committer GitHub <noreply@github.com>
Tue, 26 Jul 2022 13:20:45 +0000 (09:20 -0400)
diff --cc bgpd/rfapi/rfapi.c
Simple merge
diff --cc bgpd/rfapi/rfapi_vty.c
Simple merge
author	Russ White <russ@riw.us>
	Tue, 26 Jul 2022 13:20:45 +0000 (09:20 -0400)
committer	GitHub <noreply@github.com>
	Tue, 26 Jul 2022 13:20:45 +0000 (09:20 -0400)
		1	2
bgpd/rfapi/rfapi.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/rfapi/rfapi_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history