Merge pull request #7341 from kssoman/nssa_fix

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

Tue, 27 Oct 2020 14:30:31 +0000 (15:30 +0100)

committer GitHub <noreply@github.com>

Tue, 27 Oct 2020 14:30:31 +0000 (15:30 +0100)
author Olivier Dugeon <olivier.dugeon@orange.com>
Tue, 27 Oct 2020 14:30:31 +0000 (15:30 +0100)
committer GitHub <noreply@github.com>
Tue, 27 Oct 2020 14:30:31 +0000 (15:30 +0100)
diff --cc ospfd/ospf_lsa.c
Simple merge
diff --cc ospfd/ospf_vty.c
Simple merge
author	Olivier Dugeon <olivier.dugeon@orange.com>
	Tue, 27 Oct 2020 14:30:31 +0000 (15:30 +0100)
committer	GitHub <noreply@github.com>
	Tue, 27 Oct 2020 14:30:31 +0000 (15:30 +0100)
		1	2
ospfd/ospf_lsa.c	patch \|	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history