]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge pull request #16354 from Sokolmish/zebra-no-ra
authorDavid Lamparter <equinox@opensourcerouting.org>
Mon, 28 Oct 2024 12:28:29 +0000 (13:28 +0100)
committerGitHub <noreply@github.com>
Mon, 28 Oct 2024 12:28:29 +0000 (13:28 +0100)
1  2 
bgpd/bgp_nht.c
bgpd/bgp_vty.c
bgpd/bgpd.c
bgpd/bgpd.h
doc/user/bgp.rst

diff --cc bgpd/bgp_nht.c
Simple merge
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
diff --cc bgpd/bgpd.h
Simple merge
Simple merge