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: 84ea764 2cfe3d2)

author	Donald Sharp <sharpd@cumulusnetworks.com>
	Tue, 7 Feb 2017 18:20:12 +0000 (13:20 -0500)
committer	Donald Sharp <sharpd@cumulusnetworks.com>
	Tue, 7 Feb 2017 18:20:12 +0000 (13:20 -0500)
commit	7df2e1c3797df638016ae6d7a34e1781c0f1ced5
tree	2c7aa125a2e684ce5e2d91b37e4fc1e4dab7b024	tree \| snapshot
parent	84ea764321362381cfc2b426ef0f3329857bc83f	commit \| diff
parent	2cfe3d285ff001046b579434dea5f963082630dd	commit \| diff

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

22 files changed:

bgpd/Makefile.am	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_nht.c	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
isisd/Makefile.am	diff1 \|	diff2 \|	blob \| history
ldpd/Makefile.am	diff1 \|	diff2 \|	blob \| history
lib/Makefile.am	diff1 \|	diff2 \|	blob \| history
lib/memory.c	diff1 \|	diff2 \|	blob \| history
lib/thread.c	diff1 \|	diff2 \|	blob \| history
lib/thread.h	diff1 \|	diff2 \|	blob \| history
ospf6d/ospf6_interface.c	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_dump.c	diff1 \|	diff2 \|	blob \| history
ospfd/ospfd.c	diff1 \|	diff2 \|	blob \| history
ospfd/ospfd.h	diff1 \|	diff2 \|	blob \| history
pimd/Makefile.am	diff1 \|	diff2 \|	blob \| history
ripd/ripd.c	diff1 \|	diff2 \|	blob \| history
tests/Makefile.am	diff1 \|	diff2 \|	blob \| history
tests/test-commands.c	diff1 \|	diff2 \|	blob \| history
tools/Makefile.am	diff1 \|	diff2 \|	blob \| history
vtysh/Makefile.am	diff1 \|	diff2 \|	blob \| history
watchfrr/watchfrr.c	diff1 \|	diff2 \|	blob \| history
zebra/Makefile.am	diff1 \|	diff2 \|	blob \| history
zebra/test_main.c	diff1 \|	diff2 \|	blob \| history

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