]> git.proxmox.com Git - mirror_frr.git/commit
Merge branch 'master' into fix-proto_redistnum
authorQuentin Young <qlyoung@users.noreply.github.com>
Sat, 7 Jan 2017 00:44:46 +0000 (19:44 -0500)
committerGitHub <noreply@github.com>
Sat, 7 Jan 2017 00:44:46 +0000 (19:44 -0500)
commitb84aadae447e1d5e534d2d46e3922f47c316d107
treeaba0baabd2a34ec52b5f8a37db92bec576d53e4a
parent6d681bd874dc7dee4300a5d3a5ced8bb1a679643
parent40bfb7248f016b8c7862a188fe8f448ddccb9ecc
Merge branch 'master' into fix-proto_redistnum
bgpd/bgp_vty.c
isisd/isis_redist.c
lib/log.c
ospf6d/ospf6_asbr.c
ospfd/ospf_vty.c
ripd/rip_zebra.c
ripngd/ripng_zebra.c
vtysh/vtysh.c
zebra/zebra_vty.c