]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge pull request #6938 from opensourcerouting/bgp-instance-shutdown
authorRuss White <russ@riw.us>
Tue, 25 Aug 2020 14:31:01 +0000 (10:31 -0400)
committerGitHub <noreply@github.com>
Tue, 25 Aug 2020 14:31:01 +0000 (10:31 -0400)
bgpd: BGP instance administrative shutdown

1  2 
bgpd/bgp_fsm.c
bgpd/bgp_packet.c
bgpd/bgp_vty.c
bgpd/bgpd.c

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