Merge pull request #7707 from opensourcerouting/isisd-rlfa

author Olivier Dugeon <olivier.dugeon@orange.com>

Tue, 12 Jan 2021 18:25:15 +0000 (19:25 +0100)

committer GitHub <noreply@github.com>

Tue, 12 Jan 2021 18:25:15 +0000 (19:25 +0100)
author Olivier Dugeon <olivier.dugeon@orange.com>
Tue, 12 Jan 2021 18:25:15 +0000 (19:25 +0100)
committer GitHub <noreply@github.com>
Tue, 12 Jan 2021 18:25:15 +0000 (19:25 +0100)
diff --cc isisd/isis_nb_config.c
Simple merge
diff --cc isisd/isis_spf.c
Simple merge
author	Olivier Dugeon <olivier.dugeon@orange.com>
	Tue, 12 Jan 2021 18:25:15 +0000 (19:25 +0100)
committer	GitHub <noreply@github.com>
	Tue, 12 Jan 2021 18:25:15 +0000 (19:25 +0100)
		1	2
isisd/isis_nb_config.c	patch \|	diff1 \|	diff2 \|	blob \| history
isisd/isis_spf.c	patch \|	diff1 \|	diff2 \|	blob \| history