Merge pull request #14118 from GaladrielZhao/master

author Donatas Abraitis <donatas@opensourcerouting.org>

Wed, 30 Aug 2023 14:43:29 +0000 (17:43 +0300)

committer GitHub <noreply@github.com>

Wed, 30 Aug 2023 14:43:29 +0000 (17:43 +0300)
author Donatas Abraitis <donatas@opensourcerouting.org>
Wed, 30 Aug 2023 14:43:29 +0000 (17:43 +0300)
committer GitHub <noreply@github.com>
Wed, 30 Aug 2023 14:43:29 +0000 (17:43 +0300)
diff --cc bgpd/bgp_fsm.c
Simple merge
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc bgpd/bgpd.h
Simple merge
author	Donatas Abraitis <donatas@opensourcerouting.org>
	Wed, 30 Aug 2023 14:43:29 +0000 (17:43 +0300)
committer	GitHub <noreply@github.com>
	Wed, 30 Aug 2023 14:43:29 +0000 (17:43 +0300)
		1	2
bgpd/bgp_fsm.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.h	patch \|	diff1 \|	diff2 \|	blob \| history