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: b384af4 56041a7)

author	Donald Sharp <sharpd@cumulusnetworks.com>
	Thu, 2 Feb 2017 15:42:51 +0000 (10:42 -0500)
committer	Donald Sharp <sharpd@cumulusnetworks.com>
	Thu, 2 Feb 2017 15:42:51 +0000 (10:42 -0500)
commit	1a35e2e56533f75d68ed30bf24b3c131da4ba950
tree	068c7730ed7a58d5374d8123d81720597b40bbcd	tree \| snapshot
parent	b384af46d50caaae87e1c7807227ac6b4d87f377	commit \| diff
parent	56041a77064fe6924ca55dd4e394777b7a5900d0	commit \| diff

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

25 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_bfd.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_dump.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_main.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_vty.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
debian/changelog	diff1 \|	diff2 \|	blob \| history
isisd/isis_tlv.c	diff1 \|	diff2 \|	blob \| history
isisd/isis_tlv.h	diff1 \|	diff2 \|	blob \| history
ldpd/ldp_vty_exec.c	diff1 \|	diff2 \|	blob \| history
ldpd/ldpd.c	diff1 \|	diff2 \|	blob \| history
ldpd/ldpd.h	diff1 \|	diff2 \|	blob \| history
ldpd/ldpe.c	diff1 \|	diff2 \|	blob \| history
ldpd/ldpe.h	diff1 \|	diff2 \|	blob \| history
lib/plist.c	diff1 \|	diff2 \|	blob \| history
lib/sockopt.c	diff1 \|	diff2 \|	blob \| history
lib/sockopt.h	diff1 \|	diff2 \|	blob \| history
lib/vty.c	diff1 \|	diff2 \|	blob \| history
pimd/pim_main.c	diff1 \|	diff2 \|	blob \| history
vtysh/extract.pl.in	diff1 \|	diff2 \|	blob \| history
vtysh/vtysh.c	diff1 \|	diff2 \|	blob \| history
vtysh/vtysh_user.c	diff1 \|	diff2 \|	blob \| history
zebra/rt_netlink.c	diff1 \|	diff2 \|	blob \| history
zebra/zebra_ptm.c	diff1 \|	diff2 \|	blob \| history

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