Merge pull request #10074 from opensourcerouting/assorted-20211116

author Igor Ryzhov <iryzhov@nfware.com>

Fri, 19 Nov 2021 12:43:10 +0000 (15:43 +0300)

committer GitHub <noreply@github.com>

Fri, 19 Nov 2021 12:43:10 +0000 (15:43 +0300)
author Igor Ryzhov <iryzhov@nfware.com>
Fri, 19 Nov 2021 12:43:10 +0000 (15:43 +0300)
committer GitHub <noreply@github.com>
Fri, 19 Nov 2021 12:43:10 +0000 (15:43 +0300)
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc lib/routemap.c
Simple merge
diff --cc vtysh/vtysh.c
Simple merge
diff --cc zebra/interface.c
Simple merge
author	Igor Ryzhov <iryzhov@nfware.com>
	Fri, 19 Nov 2021 12:43:10 +0000 (15:43 +0300)
committer	GitHub <noreply@github.com>
	Fri, 19 Nov 2021 12:43:10 +0000 (15:43 +0300)
		1	2
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/routemap.c	patch \|	diff1 \|	diff2 \|	blob \| history
vtysh/vtysh.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/interface.c	patch \|	diff1 \|	diff2 \|	blob \| history