]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge pull request #7439 from opensourcerouting/bgp-damp-profile2
authorDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 12 Jan 2021 16:45:41 +0000 (11:45 -0500)
committerGitHub <noreply@github.com>
Tue, 12 Jan 2021 16:45:41 +0000 (11:45 -0500)
bgpd: BGP route-flap dampening profiles for peers and peer groups

1  2 
bgpd/bgp_route.c
bgpd/bgp_vty.c
bgpd/bgpd.c
bgpd/bgpd.h
doc/user/bgp.rst

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