]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge pull request #5865 from slankdev/slankdev-zebra-srv6-manager
authorMark Stapp <mjs@voltanet.io>
Fri, 4 Jun 2021 17:41:55 +0000 (13:41 -0400)
committerGitHub <noreply@github.com>
Fri, 4 Jun 2021 17:41:55 +0000 (13:41 -0400)
zebra: srv6 manager

1  2 
bgpd/bgp_vty.c
doc/user/sharp.rst
doc/user/zebra.rst
lib/command.c

diff --cc bgpd/bgp_vty.c
Simple merge
Simple merge
Simple merge
diff --cc lib/command.c
Simple merge