Merge pull request #9486 from slankdev/slankdev-srv6-no-cli-1

author Igor Ryzhov <iryzhov@nfware.com>

Tue, 14 Sep 2021 16:04:03 +0000 (19:04 +0300)

committer GitHub <noreply@github.com>

Tue, 14 Sep 2021 16:04:03 +0000 (19:04 +0300)
author Igor Ryzhov <iryzhov@nfware.com>
Tue, 14 Sep 2021 16:04:03 +0000 (19:04 +0300)
committer GitHub <noreply@github.com>
Tue, 14 Sep 2021 16:04:03 +0000 (19:04 +0300)
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc bgpd/bgp_zebra.c
Simple merge
diff --cc zebra/zapi_msg.c
Simple merge
author	Igor Ryzhov <iryzhov@nfware.com>
	Tue, 14 Sep 2021 16:04:03 +0000 (19:04 +0300)
committer	GitHub <noreply@github.com>
	Tue, 14 Sep 2021 16:04:03 +0000 (19:04 +0300)
		1	2
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_zebra.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zapi_msg.c	patch \|	diff1 \|	diff2 \|	blob \| history