Merge pull request #7961 from mobash-rasool/ospfv3-feature

author Mark Stapp <mjs@voltanet.io>

Thu, 4 Feb 2021 18:32:34 +0000 (13:32 -0500)

committer GitHub <noreply@github.com>

Thu, 4 Feb 2021 18:32:34 +0000 (13:32 -0500)
author Mark Stapp <mjs@voltanet.io>
Thu, 4 Feb 2021 18:32:34 +0000 (13:32 -0500)
committer GitHub <noreply@github.com>
Thu, 4 Feb 2021 18:32:34 +0000 (13:32 -0500)
diff --cc doc/user/ospf6d.rst
Simple merge
diff --cc ospf6d/ospf6_top.c
Simple merge
author	Mark Stapp <mjs@voltanet.io>
	Thu, 4 Feb 2021 18:32:34 +0000 (13:32 -0500)
committer	GitHub <noreply@github.com>
	Thu, 4 Feb 2021 18:32:34 +0000 (13:32 -0500)
		1	2
doc/user/ospf6d.rst	patch \|	diff1 \|	diff2 \|	blob \| history
ospf6d/ospf6_top.c	patch \|	diff1 \|	diff2 \|	blob \| history