]> git.puffer.fish Git - mirror/frr.git/commit
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 27 Nov 2015 16:58:52 +0000 (08:58 -0800)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 27 Nov 2015 16:58:52 +0000 (08:58 -0800)
commitcbdee2350a4a12d96a35d7fa937900b9063e11ec
treee1de157dc1933f51c65777f2b8e40be05d11df6e
parentda11a696bcb3f75f2941237590241ff91ca165b0
parentb3d439f347174feff00006709e0cb63361fd98b5
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
12 files changed:
bgpd/bgp_bfd.c
bgpd/bgp_route.c
bgpd/bgp_vty.c
bgpd/bgpd.c
ospf6d/ospf6_area.c
ospf6d/ospf6_interface.c
ospfd/ospf_bfd.c
zebra/rt_netlink.c
zebra/zebra_rib.c
zebra/zebra_rnh.c
zebra/zebra_vty.c
zebra/zserv.c