Merge pull request #820 from opensourcerouting/gcc7

author Donald Sharp <sharpd@cumulusnetworks.com>

Fri, 14 Jul 2017 16:54:40 +0000 (12:54 -0400)

committer GitHub <noreply@github.com>

Fri, 14 Jul 2017 16:54:40 +0000 (12:54 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Fri, 14 Jul 2017 16:54:40 +0000 (12:54 -0400)
committer GitHub <noreply@github.com>
Fri, 14 Jul 2017 16:54:40 +0000 (12:54 -0400)
diff --cc ospf6d/ospf6_message.c
Simple merge
diff --cc ospf6d/ospf6_snmp.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Fri, 14 Jul 2017 16:54:40 +0000 (12:54 -0400)
committer	GitHub <noreply@github.com>
	Fri, 14 Jul 2017 16:54:40 +0000 (12:54 -0400)
		1	2
ospf6d/ospf6_message.c	patch \|	diff1 \|	diff2 \|	blob \| history
ospf6d/ospf6_snmp.c	patch \|	diff1 \|	diff2 \|	blob \| history