]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #2501 from pacovn/infer_unused1
authorQuentin Young <qlyoung@users.noreply.github.com>
Thu, 21 Jun 2018 19:12:33 +0000 (15:12 -0400)
committerGitHub <noreply@github.com>
Thu, 21 Jun 2018 19:12:33 +0000 (15:12 -0400)
bgpd isisd ldpd lib ospfd pimd: redundancy (infer, grouped)

1  2 
bgpd/bgp_vpn.c
bgpd/bgp_vty.c

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