Merge pull request #7448 from mjstapp/fix_gcc10_formats

author Donald Sharp <sharpd@cumulusnetworks.com>

Tue, 10 Nov 2020 16:23:02 +0000 (11:23 -0500)

committer GitHub <noreply@github.com>

Tue, 10 Nov 2020 16:23:02 +0000 (11:23 -0500)
author Donald Sharp <sharpd@cumulusnetworks.com>
Tue, 10 Nov 2020 16:23:02 +0000 (11:23 -0500)
committer GitHub <noreply@github.com>
Tue, 10 Nov 2020 16:23:02 +0000 (11:23 -0500)
diff --cc ospf6d/ospf6_abr.c
Simple merge
diff --cc ospfd/ospf_opaque.h
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Tue, 10 Nov 2020 16:23:02 +0000 (11:23 -0500)
committer	GitHub <noreply@github.com>
	Tue, 10 Nov 2020 16:23:02 +0000 (11:23 -0500)
		1	2
ospf6d/ospf6_abr.c	patch \|	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_opaque.h	patch \|	diff1 \|	diff2 \|	blob \| history