git.puffer.fish Git - matthieu/frr.git/commit

]> git.puffer.fish Git - matthieu/frr.git/commit

projects / matthieu / frr.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: df581cd 826fe61)

author	Donald Sharp <sharpd@cumulusnetworks.com>
	Tue, 2 May 2017 19:52:09 +0000 (15:52 -0400)
committer	Donald Sharp <sharpd@cumulusnetworks.com>
	Tue, 2 May 2017 19:52:09 +0000 (15:52 -0400)
commit	05ba625af7cbeb08322a1ea761732521816245bd
tree	b5501ff31d67ec53a0da4935f59a17478b637255	tree \| snapshot
parent	df581cd3e137e8d3ab0f9acbb3d33bdb1e63face	commit \| diff
parent	826fe613f95fcf6047c987757c946bb53cb99929	commit \| diff

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

15 files changed:

bgpd/bgp_route.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_vty.c	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
ldpd/interface.c	diff1 \|	diff2 \|	blob \| history
ldpd/ldp_zebra.c	diff1 \|	diff2 \|	blob \| history
ldpd/ldpd.h	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_vty.c	diff1 \|	diff2 \|	blob \| history
pimd/pim_cmd.c	diff1 \|	diff2 \|	blob \| history
pimd/pim_neighbor.c	diff1 \|	diff2 \|	blob \| history
pimd/pim_rp.c	diff1 \|	diff2 \|	blob \| history
pimd/pim_vty.c	diff1 \|	diff2 \|	blob \| history
pimd/pimd.c	diff1 \|	diff2 \|	blob \| history
pimd/pimd.h	diff1 \|	diff2 \|	blob \| history
vtysh/vtysh.c	diff1 \|	diff2 \|	blob \| history
zebra/interface.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.