Merge pull request #8137 from Orange-OpenSource/ospf_ls

author Russ White <russ@riw.us>

Tue, 30 Mar 2021 14:28:37 +0000 (10:28 -0400)

committer GitHub <noreply@github.com>

Tue, 30 Mar 2021 14:28:37 +0000 (10:28 -0400)
author Russ White <russ@riw.us>
Tue, 30 Mar 2021 14:28:37 +0000 (10:28 -0400)
committer GitHub <noreply@github.com>
Tue, 30 Mar 2021 14:28:37 +0000 (10:28 -0400)
diff --cc doc/user/ospfd.rst
Simple merge
diff --cc lib/zclient.h
Simple merge
author	Russ White <russ@riw.us>
	Tue, 30 Mar 2021 14:28:37 +0000 (10:28 -0400)
committer	GitHub <noreply@github.com>
	Tue, 30 Mar 2021 14:28:37 +0000 (10:28 -0400)
		1	2
doc/user/ospfd.rst	patch \|	diff1 \|	diff2 \|	blob \| history
lib/zclient.h	patch \|	diff1 \|	diff2 \|	blob \| history