Merge pull request #6731 from opensourcerouting/style-string-prep

author Donald Sharp <sharpd@cumulusnetworks.com>

Thu, 16 Jul 2020 00:06:55 +0000 (20:06 -0400)

committer GitHub <noreply@github.com>

Thu, 16 Jul 2020 00:06:55 +0000 (20:06 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Thu, 16 Jul 2020 00:06:55 +0000 (20:06 -0400)
committer GitHub <noreply@github.com>
Thu, 16 Jul 2020 00:06:55 +0000 (20:06 -0400)
diff --cc bfdd/bfdd_nb_config.c
Simple merge
diff --cc lib/routemap.c
Simple merge
diff --cc ospfd/ospf_lsa.c
Simple merge
diff --cc ospfd/ospf_zebra.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Thu, 16 Jul 2020 00:06:55 +0000 (20:06 -0400)
committer	GitHub <noreply@github.com>
	Thu, 16 Jul 2020 00:06:55 +0000 (20:06 -0400)
		1	2
bfdd/bfdd_nb_config.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/routemap.c	patch \|	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_lsa.c	patch \|	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_zebra.c	patch \|	diff1 \|	diff2 \|	blob \| history