]> git.puffer.fish Git - mirror/frr.git/commit
Merge remote-tracking branch 'origin/cmaster' into cmaster-next
authorDonald Sharp <sharpd@cumulusnetwroks.com>
Wed, 13 Jul 2016 00:24:00 +0000 (20:24 -0400)
committerDonald Sharp <sharpd@cumulusnetwroks.com>
Wed, 13 Jul 2016 00:24:00 +0000 (20:24 -0400)
commit275382273bc8b9d1868c6fbefd139c0a708a7d93
treef92eaea2ef63bcc708b20b74aacfb4f09c5ac25b
parent4416b1f6c2d8b8a08a34ad19a22f24c30a922fff
parentcc146ecc00f96137027cc909a78e83f8ec02c08c
Merge remote-tracking branch 'origin/cmaster' into cmaster-next
bgpd/bgp_zebra.c
bgpd/bgpd.c
configure.ac
ospf6d/ospf6_zebra.c
ospfd/ospf_zebra.c
redhat/quagga.spec.in
zebra/zserv.c