]> git.puffer.fish Git - matthieu/frr.git/commit
projects / matthieu / frr.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0b0038b 7d53a49)
Merge remote-tracking branch 'origin/stable/2.0'
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 6 Jan 2017 14:58:21 +0000 (09:58 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 6 Jan 2017 14:58:21 +0000 (09:58 -0500)
commit3b14d86eed3c042db718c7e006ca5299f473c88e
tree4efde6b2d77f5229ace3375da3471b0db1daa695tree | snapshot
parent0b0038b8bcf84beda44fb69a60b2620b0387d8e8commit | diff
parent7d53a49360ddceb16db34bc8a84039cb2ecab22ccommit | diff
Merge remote-tracking branch 'origin/stable/2.0'
38 files changed:
.gitignore diff1 | diff2 | blob | history
bgpd/bgp_attr.c diff1 | diff2 | blob | history
bgpd/bgp_ecommunity.c diff1 | diff2 | blob | history
bgpd/bgp_encap.c diff1 | diff2 | blob | history
bgpd/bgp_mplsvpn.c diff1 | diff2 | blob | history
bgpd/bgp_route.c diff1 | diff2 | blob | history
bgpd/bgp_updgrp_adv.c diff1 | diff2 | blob | history
bgpd/bgp_vty.c diff1 | diff2 | blob | history
bgpd/bgp_vty.h diff1 | diff2 | blob | history
bgpd/rfapi/bgp_rfapi_cfg.c diff1 | diff2 | blob | history
bgpd/rfapi/rfapi.c diff1 | diff2 | blob | history
bgpd/rfapi/rfapi_vty.c diff1 | diff2 | blob | history
configure.ac diff1 | diff2 | blob | history
debian/control diff1 | diff2 | blob | history
isisd/isis_redist.c diff1 | diff2 | blob | history
isisd/isisd.c diff1 | diff2 | blob | history
ldpd/lde.c diff1 | diff2 | blob | history
lib/command.c diff1 | diff2 | blob | history
lib/log.h diff1 | diff2 | blob | history
lib/route_types.txt diff1 | diff2 | blob | history
lib/routemap.c diff1 | diff2 | blob | history
lib/smux.c diff1 | diff2 | blob | history
lib/vty.c diff1 | diff2 | blob | history
lib/zebra.h diff1 | diff2 | blob | history
ospf6d/ospf6_asbr.c diff1 | diff2 | blob | history
ospfd/ospf_vty.c diff1 | diff2 | blob | history
pimd/pim_cmd.c diff1 | diff2 | blob | history
pimd/pim_cmd.h diff1 | diff2 | blob | history
pimd/pim_vty.c diff1 | diff2 | blob | history
ripd/rip_zebra.c diff1 | diff2 | blob | history
ripngd/ripng_zebra.c diff1 | diff2 | blob | history
tools/Makefile.am diff1 | diff2 | blob | history
vtysh/vtysh.c diff1 | diff2 | blob | history
vtysh/vtysh_user.c diff1 | diff2 | blob | history
zebra/test_main.c diff1 | diff2 | blob | history
zebra/zebra_routemap.c diff1 | diff2 | blob | history
zebra/zebra_static.c diff1 | diff2 | blob | history
zebra/zebra_vty.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.