Merge pull request #7189 from maduri111/bgpd-conditional-adv

author Rafael Zalamena <rzalamena@users.noreply.github.com>

Tue, 27 Oct 2020 15:24:24 +0000 (12:24 -0300)

committer GitHub <noreply@github.com>

Tue, 27 Oct 2020 15:24:24 +0000 (12:24 -0300)
author Rafael Zalamena <rzalamena@users.noreply.github.com>
Tue, 27 Oct 2020 15:24:24 +0000 (12:24 -0300)
committer GitHub <noreply@github.com>
Tue, 27 Oct 2020 15:24:24 +0000 (12:24 -0300)
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc bgpd/bgp_route.h
Simple merge
diff --cc bgpd/bgp_vty.c
Simple merge
author	Rafael Zalamena <rzalamena@users.noreply.github.com>
	Tue, 27 Oct 2020 15:24:24 +0000 (12:24 -0300)
committer	GitHub <noreply@github.com>
	Tue, 27 Oct 2020 15:24:24 +0000 (12:24 -0300)
		1	2
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_route.h	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history