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: 2d828a0 f731a65)

author	Donald Sharp <sharpd@cumulusnetworks.com>
	Wed, 24 May 2017 15:22:35 +0000 (11:22 -0400)
committer	Donald Sharp <sharpd@cumulusnetworks.com>
	Wed, 24 May 2017 15:22:35 +0000 (11:22 -0400)
commit	9e962de4b619a00a139f8982c9e6528553927f14
tree	7df0f155c27bc9b5993df17d21a22314be2fb413	tree
parent	2d828a0c671bdac6299cf3cde2b66e3589b47c60	commit \| diff
parent	f731a65469170480bb25c05463fba8d69f172328	commit \| diff

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

lib/privs.c	diff1 \|	diff2 \|	blob \| history
nhrpd/nhrp_vty.c	diff1 \|	diff2 \|	blob \| history
ospf6d/ospf6_intra.c	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_abr.c	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_interface.c	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_interface.h	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_vty.c	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_vty.h	diff1 \|	diff2 \|	blob \| history
ospfd/ospfd.c	diff1 \|	diff2 \|	blob \| history
ospfd/ospfd.h	diff1 \|	diff2 \|	blob \| history

FRRouting mirror