]> git.proxmox.com Git - mirror_frr.git/commit - zebra/kernel_netlink.c
Merge remote-tracking branch 'origin/cmaster' into cmaster-next
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 21 Oct 2016 20:05:03 +0000 (16:05 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 21 Oct 2016 20:05:03 +0000 (16:05 -0400)
commit882261e18b9632092d2e7f226f68e2a1c54a7241
treeea0ddd6d95606b07a4b84a6cda03f2ab31463b54
parentaac9ef6cb0169ea96debe2872066021608631c16
parent36602be128d4f4e49c19555a194430b9691c9a30
Merge remote-tracking branch 'origin/cmaster' into cmaster-next
bgpd/bgp_network.c
bgpd/bgp_route.c
ospfd/ospf_vty.c
zebra/kernel_netlink.c
zebra/zebra_static.c
zebra/zebra_static.h
zebra/zebra_vty.c