Merge pull request #9938 from Orange-OpenSource/isis_ls

author Russ White <russ@riw.us>

Tue, 18 Jan 2022 15:12:08 +0000 (10:12 -0500)

committer GitHub <noreply@github.com>

Tue, 18 Jan 2022 15:12:08 +0000 (10:12 -0500)
author Russ White <russ@riw.us>
Tue, 18 Jan 2022 15:12:08 +0000 (10:12 -0500)
committer GitHub <noreply@github.com>
Tue, 18 Jan 2022 15:12:08 +0000 (10:12 -0500)
diff --cc isisd/isis_adjacency.c
Simple merge
diff --cc isisd/isis_cli.c
Simple merge
diff --cc isisd/isisd.c
Simple merge
author	Russ White <russ@riw.us>
	Tue, 18 Jan 2022 15:12:08 +0000 (10:12 -0500)
committer	GitHub <noreply@github.com>
	Tue, 18 Jan 2022 15:12:08 +0000 (10:12 -0500)
		1	2
isisd/isis_adjacency.c	patch \|	diff1 \|	diff2 \|	blob \| history
isisd/isis_cli.c	patch \|	diff1 \|	diff2 \|	blob \| history
isisd/isisd.c	patch \|	diff1 \|	diff2 \|	blob \| history