Merge pull request #13060 from opensourcerouting/feature/allow_peering_with_127.0.0.1

author Jafar Al-Gharaibeh <jafar@atcorp.com>

Fri, 31 Mar 2023 05:14:27 +0000 (00:14 -0500)

committer GitHub <noreply@github.com>

Fri, 31 Mar 2023 05:14:27 +0000 (00:14 -0500)
author Jafar Al-Gharaibeh <jafar@atcorp.com>
Fri, 31 Mar 2023 05:14:27 +0000 (00:14 -0500)
committer GitHub <noreply@github.com>
Fri, 31 Mar 2023 05:14:27 +0000 (00:14 -0500)
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc bgpd/bgp_zebra.c
Simple merge
author	Jafar Al-Gharaibeh <jafar@atcorp.com>
	Fri, 31 Mar 2023 05:14:27 +0000 (00:14 -0500)
committer	GitHub <noreply@github.com>
	Fri, 31 Mar 2023 05:14:27 +0000 (00:14 -0500)
		1	2
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_zebra.c	patch \|	diff1 \|	diff2 \|	blob \| history