Merge pull request #7461 from donaldsharp/attribute_setget

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

Mon, 16 Nov 2020 10:20:40 +0000 (12:20 +0200)

committer GitHub <noreply@github.com>

Mon, 16 Nov 2020 10:20:40 +0000 (12:20 +0200)
author Donatas Abraitis <donatas.abraitis@gmail.com>
Mon, 16 Nov 2020 10:20:40 +0000 (12:20 +0200)
committer GitHub <noreply@github.com>
Mon, 16 Nov 2020 10:20:40 +0000 (12:20 +0200)
diff --cc bgpd/bgp_evpn.c
Simple merge
diff --cc bgpd/bgp_route.c
Simple merge
author	Donatas Abraitis <donatas.abraitis@gmail.com>
	Mon, 16 Nov 2020 10:20:40 +0000 (12:20 +0200)
committer	GitHub <noreply@github.com>
	Mon, 16 Nov 2020 10:20:40 +0000 (12:20 +0200)
		1	2
bgpd/bgp_evpn.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history