Merge pull request #10987 from opensourcerouting/fix/bgp_conditional_advertisements_r...

author Russ White <russ@riw.us>

Wed, 13 Apr 2022 19:00:14 +0000 (15:00 -0400)

committer GitHub <noreply@github.com>

Wed, 13 Apr 2022 19:00:14 +0000 (15:00 -0400)
author Russ White <russ@riw.us>
Wed, 13 Apr 2022 19:00:14 +0000 (15:00 -0400)
committer GitHub <noreply@github.com>
Wed, 13 Apr 2022 19:00:14 +0000 (15:00 -0400)
diff --cc bgpd/bgp_routemap.c
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
author	Russ White <russ@riw.us>
	Wed, 13 Apr 2022 19:00:14 +0000 (15:00 -0400)
committer	GitHub <noreply@github.com>
	Wed, 13 Apr 2022 19:00:14 +0000 (15:00 -0400)
		1	2
bgpd/bgp_routemap.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history