Merge pull request #7127 from opensourcerouting/ospf_ti-lfa

author Russ White <russ@riw.us>

Tue, 26 Jan 2021 12:32:04 +0000 (07:32 -0500)

committer GitHub <noreply@github.com>

Tue, 26 Jan 2021 12:32:04 +0000 (07:32 -0500)
author Russ White <russ@riw.us>
Tue, 26 Jan 2021 12:32:04 +0000 (07:32 -0500)
committer GitHub <noreply@github.com>
Tue, 26 Jan 2021 12:32:04 +0000 (07:32 -0500)
diff --cc ospfd/ospf_lsa.c
Simple merge
diff --cc ospfd/ospf_vty.c
Simple merge
author	Russ White <russ@riw.us>
	Tue, 26 Jan 2021 12:32:04 +0000 (07:32 -0500)
committer	GitHub <noreply@github.com>
	Tue, 26 Jan 2021 12:32:04 +0000 (07:32 -0500)
		1	2
ospfd/ospf_lsa.c	patch \|	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history