Merge pull request #9397 from tkms1122/master

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

Wed, 1 Sep 2021 07:33:59 +0000 (10:33 +0300)

committer GitHub <noreply@github.com>

Wed, 1 Sep 2021 07:33:59 +0000 (10:33 +0300)
author Donatas Abraitis <donatas.abraitis@gmail.com>
Wed, 1 Sep 2021 07:33:59 +0000 (10:33 +0300)
committer GitHub <noreply@github.com>
Wed, 1 Sep 2021 07:33:59 +0000 (10:33 +0300)
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc doc/user/bgp.rst
Simple merge
author	Donatas Abraitis <donatas.abraitis@gmail.com>
	Wed, 1 Sep 2021 07:33:59 +0000 (10:33 +0300)
committer	GitHub <noreply@github.com>
	Wed, 1 Sep 2021 07:33:59 +0000 (10:33 +0300)
		1	2
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
doc/user/bgp.rst	patch \|	diff1 \|	diff2 \|	blob \| history