Merge pull request #7454 from ranjanyash54/dev_8

author Donald Sharp <sharpd@cumulusnetworks.com>

Wed, 18 Nov 2020 23:37:30 +0000 (18:37 -0500)

committer GitHub <noreply@github.com>

Wed, 18 Nov 2020 23:37:30 +0000 (18:37 -0500)
author Donald Sharp <sharpd@cumulusnetworks.com>
Wed, 18 Nov 2020 23:37:30 +0000 (18:37 -0500)
committer GitHub <noreply@github.com>
Wed, 18 Nov 2020 23:37:30 +0000 (18:37 -0500)
diff --cc doc/user/ospf6d.rst
Simple merge
diff --cc ospf6d/ospf6_interface.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Wed, 18 Nov 2020 23:37:30 +0000 (18:37 -0500)
committer	GitHub <noreply@github.com>
	Wed, 18 Nov 2020 23:37:30 +0000 (18:37 -0500)
		1	2
doc/user/ospf6d.rst	patch \|	diff1 \|	diff2 \|	blob \| history
ospf6d/ospf6_interface.c	patch \|	diff1 \|	diff2 \|	blob \| history