Merge pull request #10288 from ton31337/fix/rfc7300

author Donald Sharp <donaldsharp72@gmail.com>

Sat, 8 Jan 2022 13:42:19 +0000 (08:42 -0500)

committer GitHub <noreply@github.com>

Sat, 8 Jan 2022 13:42:19 +0000 (08:42 -0500)
author Donald Sharp <donaldsharp72@gmail.com>
Sat, 8 Jan 2022 13:42:19 +0000 (08:42 -0500)
committer GitHub <noreply@github.com>
Sat, 8 Jan 2022 13:42:19 +0000 (08:42 -0500)
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc doc/user/overview.rst
Simple merge
author	Donald Sharp <donaldsharp72@gmail.com>
	Sat, 8 Jan 2022 13:42:19 +0000 (08:42 -0500)
committer	GitHub <noreply@github.com>
	Sat, 8 Jan 2022 13:42:19 +0000 (08:42 -0500)
		1	2
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
doc/user/overview.rst	patch \|	diff1 \|	diff2 \|	blob \| history