Merge pull request #9699 from manojvn/379032-dev

author Russ White <russ@riw.us>

Wed, 6 Oct 2021 23:00:39 +0000 (19:00 -0400)

committer GitHub <noreply@github.com>

Wed, 6 Oct 2021 23:00:39 +0000 (19:00 -0400)
author Russ White <russ@riw.us>
Wed, 6 Oct 2021 23:00:39 +0000 (19:00 -0400)
committer GitHub <noreply@github.com>
Wed, 6 Oct 2021 23:00:39 +0000 (19:00 -0400)
diff --cc ospf6d/ospf6_asbr.c
Simple merge
diff --cc ospf6d/ospf6_flood.c
Simple merge
diff --cc ospf6d/ospf6_message.c
Simple merge
author	Russ White <russ@riw.us>
	Wed, 6 Oct 2021 23:00:39 +0000 (19:00 -0400)
committer	GitHub <noreply@github.com>
	Wed, 6 Oct 2021 23:00:39 +0000 (19:00 -0400)
		1	2
ospf6d/ospf6_asbr.c	patch \|	diff1 \|	diff2 \|	blob \| history
ospf6d/ospf6_flood.c	patch \|	diff1 \|	diff2 \|	blob \| history
ospf6d/ospf6_message.c	patch \|	diff1 \|	diff2 \|	blob \| history