]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge pull request #7756 from pjdruddy/bgplu-fixes
authorDonald Sharp <sharpd@cumulusnetworks.com>
Sat, 9 Jan 2021 20:48:22 +0000 (15:48 -0500)
committerGitHub <noreply@github.com>
Sat, 9 Jan 2021 20:48:22 +0000 (15:48 -0500)
Bgplu fixes

1  2 
bgpd/bgp_route.c
bgpd/bgpd.c
doc/user/bgp.rst
zebra/label_manager.c

Simple merge
diff --cc bgpd/bgpd.c
Simple merge
Simple merge
Simple merge