]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #4765 from opensourcerouting/defaults-v2
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 6 Dec 2019 19:07:42 +0000 (14:07 -0500)
committerGitHub <noreply@github.com>
Fri, 6 Dec 2019 19:07:42 +0000 (14:07 -0500)
lib/*: new config defaults system, v2

1  2 
bgpd/bgp_evpn.c
ospfd/ospf_vty.c
zebra/main.c

diff --cc bgpd/bgp_evpn.c
Simple merge
Simple merge
diff --cc zebra/main.c
Simple merge