Merge pull request #9155 from FRRouting/mergify/bp/stable/8.0/pr-8956

author Donatas Abraitis <donatas.abraitis@gmail.com>

Fri, 30 Jul 2021 15:08:03 +0000 (18:08 +0300)

committer GitHub <noreply@github.com>

Fri, 30 Jul 2021 15:08:03 +0000 (18:08 +0300)
author Donatas Abraitis <donatas.abraitis@gmail.com>
Fri, 30 Jul 2021 15:08:03 +0000 (18:08 +0300)
committer GitHub <noreply@github.com>
Fri, 30 Jul 2021 15:08:03 +0000 (18:08 +0300)
diff --cc bgpd/bgp_nht.c
Simple merge
diff --cc bgpd/bgp_route.c
Simple merge
author	Donatas Abraitis <donatas.abraitis@gmail.com>
	Fri, 30 Jul 2021 15:08:03 +0000 (18:08 +0300)
committer	GitHub <noreply@github.com>
	Fri, 30 Jul 2021 15:08:03 +0000 (18:08 +0300)
		1	2
bgpd/bgp_nht.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history