]> git.proxmox.com Git - mirror_frr.git/commit
projects / mirror_frr.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 01cb146 5551c07)
Merge remote-tracking branch 'origin/master' into pim_lib_work2
authorDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 18 Jan 2017 02:01:56 +0000 (21:01 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 18 Jan 2017 02:01:56 +0000 (21:01 -0500)
commitb58ed1f8a89ea32c2380bf79057e5333109d72d4
treea9ead45b8895edce92ab69621a52816b45725e36tree
parent01cb1466423363a2f8b42246464feb3858df1c9fcommit | diff
parent5551c072e187c76c3d6a885cd043d6db811bab23commit | diff
Merge remote-tracking branch 'origin/master' into pim_lib_work2
74 files changed:
bgpd/bgp_attr.c diff1 | diff2 | blob | history
bgpd/bgp_open.c diff1 | diff2 | blob | history
bgpd/bgp_open.h diff1 | diff2 | blob | history
bgpd/bgp_packet.c diff1 | diff2 | blob | history
bgpd/bgp_route.c diff1 | diff2 | blob | history
bgpd/bgpd.c diff1 | diff2 | blob | history
bgpd/bgpd.h diff1 | diff2 | blob | history
lib/log.c diff1 | diff2 | blob | history
lib/zebra.h diff1 | diff2 | blob | history
pimd/DEBUG diff1 | diff2 | blob | history
pimd/Makefile.am diff1 | diff2 | blob | history
pimd/pim_assert.c diff1 | diff2 | blob | history
pimd/pim_cmd.c diff1 | diff2 | blob | history
pimd/pim_cmd.h diff1 | diff2 | blob | history
pimd/pim_hello.c diff1 | diff2 | blob | history
pimd/pim_hello.h diff1 | diff2 | blob | history
pimd/pim_iface.c diff1 | diff2 | blob | history
pimd/pim_iface.h diff1 | diff2 | blob | history
pimd/pim_ifchannel.c diff1 | diff2 | blob | history
pimd/pim_ifchannel.h diff1 | diff2 | blob | history
pimd/pim_igmp.c diff1 | diff2 | blob | history
pimd/pim_igmp.h diff1 | diff2 | blob | history
pimd/pim_igmp_join.h diff1 | diff2 | blob | history
pimd/pim_igmpv3.c diff1 | diff2 | blob | history
pimd/pim_igmpv3.h diff1 | diff2 | blob | history
pimd/pim_join.c diff1 | diff2 | blob | history
pimd/pim_join.h diff1 | diff2 | blob | history
pimd/pim_macro.c diff1 | diff2 | blob | history
pimd/pim_main.c diff1 | diff2 | blob | history
pimd/pim_mroute.c diff1 | diff2 | blob | history
pimd/pim_mroute.h diff1 | diff2 | blob | history
pimd/pim_msg.c diff1 | diff2 | blob | history
pimd/pim_msg.h diff1 | diff2 | blob | history
pimd/pim_neighbor.c diff1 | diff2 | blob | history
pimd/pim_neighbor.h diff1 | diff2 | blob | history
pimd/pim_oil.c diff1 | diff2 | blob | history
pimd/pim_oil.h diff1 | diff2 | blob | history
pimd/pim_pim.c diff1 | diff2 | blob | history
pimd/pim_pim.h diff1 | diff2 | blob | history
pimd/pim_rpf.c diff1 | diff2 | blob | history
pimd/pim_rpf.h diff1 | diff2 | blob | history
pimd/pim_signals.c diff1 | diff2 | blob | history
pimd/pim_signals.h diff1 | diff2 | blob | history
pimd/pim_sock.c diff1 | diff2 | blob | history
pimd/pim_sock.h diff1 | diff2 | blob | history
pimd/pim_ssmpingd.c diff1 | diff2 | blob | history
pimd/pim_ssmpingd.h diff1 | diff2 | blob | history
pimd/pim_static.c diff1 | diff2 | blob | history
pimd/pim_str.c diff1 | diff2 | blob | history
pimd/pim_str.h diff1 | diff2 | blob | history
pimd/pim_time.c diff1 | diff2 | blob | history
pimd/pim_time.h diff1 | diff2 | blob | history
pimd/pim_tlv.c diff1 | diff2 | blob | history
pimd/pim_tlv.h diff1 | diff2 | blob | history
pimd/pim_upstream.c diff1 | diff2 | blob | history
pimd/pim_upstream.h diff1 | diff2 | blob | history
pimd/pim_util.c diff1 | diff2 | blob | history
pimd/pim_util.h diff1 | diff2 | blob | history
pimd/pim_vty.c diff1 | diff2 | blob | history
pimd/pim_vty.h diff1 | diff2 | blob | history
pimd/pim_zebra.c diff1 | diff2 | blob | history
pimd/pim_zebra.h diff1 | diff2 | blob | history
pimd/pim_zlookup.c diff1 | diff2 | blob | history
pimd/pim_zlookup.h diff1 | diff2 | blob | history
pimd/pimd.c diff1 | diff2 | blob | history
pimd/pimd.h diff1 | diff2 | blob | history
pimd/test_igmpv3_join.c diff1 | diff2 | blob | history
zebra/if_netlink.c diff1 | diff2 | blob | history
zebra/rt_netlink.c diff1 | diff2 | blob | history
zebra/zebra_fpm_netlink.c diff1 | diff2 | blob | history
zebra/zebra_rib.c diff1 | diff2 | blob | history
zebra/zebra_static.c diff1 | diff2 | blob | history
zebra/zebra_vty.c diff1 | diff2 | blob | history
zebra/zserv.c diff1 | diff2 | blob | history
FRRouting mirror