git.proxmox.com Git - mirror_frr.git/commit

]> git.proxmox.com Git - mirror_frr.git/commit

projects / mirror_frr.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3127371 8471aeb)

author	Donald Sharp <sharpd@cumulusnetworks.com>
	Thu, 29 Jun 2017 14:10:15 +0000 (10:10 -0400)
committer	Donald Sharp <sharpd@cumulusnetworks.com>
	Thu, 29 Jun 2017 14:10:15 +0000 (10:10 -0400)
commit	b440fe5c82f73a4f34ebc59ac07e95f56e1193e0
tree	8fc9b00b7b2d4057bd70e7d1fa7085a3036733bc	tree
parent	3127371595cd10e6da89ceb2c387a26ee3ff83f7	commit \| diff
parent	8471aeb4f598b7368dda6bb15c2f22e33fc2fdd1	commit \| diff

Merge remote-tracking branch 'origin/stable/3.0'

isisd/isis_lsp.c	diff1 \|	diff2 \|	blob \| history
isisd/isis_redist.c	diff1 \|	diff2 \|	blob \| history
isisd/isis_zebra.c	diff1 \|	diff2 \|	blob \| history
isisd/isis_zebra.h	diff1 \|	diff2 \|	blob \| history
ldpd/adjacency.c	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_interface.c	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_vty.c	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_zebra.c	diff1 \|	diff2 \|	blob \| history
zebra/irdp_interface.c	diff1 \|	diff2 \|	blob \| history
zebra/irdp_main.c	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vty.c	diff1 \|	diff2 \|	blob \| history

FRRouting mirror