Merge pull request #14966 from opensourcerouting/fix/bgpd_route-map_default_originate...

author Russ White <russ@riw.us>

Tue, 12 Dec 2023 15:54:34 +0000 (10:54 -0500)

committer GitHub <noreply@github.com>

Tue, 12 Dec 2023 15:54:34 +0000 (10:54 -0500)
author Russ White <russ@riw.us>
Tue, 12 Dec 2023 15:54:34 +0000 (10:54 -0500)
committer GitHub <noreply@github.com>
Tue, 12 Dec 2023 15:54:34 +0000 (10:54 -0500)
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
author	Russ White <russ@riw.us>
	Tue, 12 Dec 2023 15:54:34 +0000 (10:54 -0500)
committer	GitHub <noreply@github.com>
	Tue, 12 Dec 2023 15:54:34 +0000 (10:54 -0500)
		1	2
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history