Merge pull request #9700 from mjstapp/add_json_det_attrs

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

Wed, 10 Nov 2021 14:42:30 +0000 (16:42 +0200)

committer GitHub <noreply@github.com>

Wed, 10 Nov 2021 14:42:30 +0000 (16:42 +0200)
author Donatas Abraitis <donatas.abraitis@gmail.com>
Wed, 10 Nov 2021 14:42:30 +0000 (16:42 +0200)
committer GitHub <noreply@github.com>
Wed, 10 Nov 2021 14:42:30 +0000 (16:42 +0200)
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc bgpd/bgp_route.h
Simple merge
author	Donatas Abraitis <donatas.abraitis@gmail.com>
	Wed, 10 Nov 2021 14:42:30 +0000 (16:42 +0200)
committer	GitHub <noreply@github.com>
	Wed, 10 Nov 2021 14:42:30 +0000 (16:42 +0200)
		1	2
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_route.h	patch \|	diff1 \|	diff2 \|	blob \| history