Merge pull request #4264 from pguibert6WIND/trace_bfd

author Donald Sharp <sharpd@cumulusnetworks.com>

Tue, 7 May 2019 01:42:18 +0000 (21:42 -0400)

committer GitHub <noreply@github.com>

Tue, 7 May 2019 01:42:18 +0000 (21:42 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Tue, 7 May 2019 01:42:18 +0000 (21:42 -0400)
committer GitHub <noreply@github.com>
Tue, 7 May 2019 01:42:18 +0000 (21:42 -0400)
diff --cc bgpd/bgp_bfd.c
Simple merge
diff --cc ospfd/ospf_bfd.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Tue, 7 May 2019 01:42:18 +0000 (21:42 -0400)
committer	GitHub <noreply@github.com>
	Tue, 7 May 2019 01:42:18 +0000 (21:42 -0400)
		1	2
bgpd/bgp_bfd.c	patch \|	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_bfd.c	patch \|	diff1 \|	diff2 \|	blob \| history