Merge pull request #7345 from opensourcerouting/bgp-aggr-suppress

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

Fri, 23 Oct 2020 12:02:57 +0000 (15:02 +0300)

committer GitHub <noreply@github.com>

Fri, 23 Oct 2020 12:02:57 +0000 (15:02 +0300)
author Donatas Abraitis <donatas.abraitis@gmail.com>
Fri, 23 Oct 2020 12:02:57 +0000 (15:02 +0300)
committer GitHub <noreply@github.com>
Fri, 23 Oct 2020 12:02:57 +0000 (15:02 +0300)
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc bgpd/bgp_route.h
Simple merge
diff --cc bgpd/bgp_routemap.c
Simple merge
author	Donatas Abraitis <donatas.abraitis@gmail.com>
	Fri, 23 Oct 2020 12:02:57 +0000 (15:02 +0300)
committer	GitHub <noreply@github.com>
	Fri, 23 Oct 2020 12:02:57 +0000 (15:02 +0300)
		1	2
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_route.h	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_routemap.c	patch \|	diff1 \|	diff2 \|	blob \| history