Merge pull request #6385 from GalaxyGorilla/bfd_igp_topotest

author Renato Westphal <renato@opensourcerouting.org>

Wed, 8 Jul 2020 17:38:09 +0000 (14:38 -0300)

committer GitHub <noreply@github.com>

Wed, 8 Jul 2020 17:38:09 +0000 (14:38 -0300)
author Renato Westphal <renato@opensourcerouting.org>
Wed, 8 Jul 2020 17:38:09 +0000 (14:38 -0300)
committer GitHub <noreply@github.com>
Wed, 8 Jul 2020 17:38:09 +0000 (14:38 -0300)
diff --cc doc/user/bfd.rst
Simple merge
diff --cc isisd/isis_spf.c
Simple merge
author	Renato Westphal <renato@opensourcerouting.org>
	Wed, 8 Jul 2020 17:38:09 +0000 (14:38 -0300)
committer	GitHub <noreply@github.com>
	Wed, 8 Jul 2020 17:38:09 +0000 (14:38 -0300)
		1	2
doc/user/bfd.rst	patch \|	diff1 \|	diff2 \|	blob \| history
isisd/isis_spf.c	patch \|	diff1 \|	diff2 \|	blob \| history