Merge pull request #8448 from ton31337/feature/show_rpki_state_in_global_show_bgp

author Sri Mohana Singamsetty <srimohans@gmail.com>

Wed, 14 Apr 2021 00:32:37 +0000 (17:32 -0700)

committer GitHub <noreply@github.com>

Wed, 14 Apr 2021 00:32:37 +0000 (17:32 -0700)
author Sri Mohana Singamsetty <srimohans@gmail.com>
Wed, 14 Apr 2021 00:32:37 +0000 (17:32 -0700)
committer GitHub <noreply@github.com>
Wed, 14 Apr 2021 00:32:37 +0000 (17:32 -0700)
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc bgpd/bgp_route.h
Simple merge
diff --cc doc/user/bgp.rst
Simple merge
author	Sri Mohana Singamsetty <srimohans@gmail.com>
	Wed, 14 Apr 2021 00:32:37 +0000 (17:32 -0700)
committer	GitHub <noreply@github.com>
	Wed, 14 Apr 2021 00:32:37 +0000 (17:32 -0700)
		1	2
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_route.h	patch \|	diff1 \|	diff2 \|	blob \| history
doc/user/bgp.rst	patch \|	diff1 \|	diff2 \|	blob \| history