Merge pull request #8656 from opensourcerouting/xref-5424-prep-2

author Donald Sharp <sharpd@cumulusnetworks.com>

Wed, 23 Jun 2021 10:08:41 +0000 (06:08 -0400)

committer GitHub <noreply@github.com>

Wed, 23 Jun 2021 10:08:41 +0000 (06:08 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Wed, 23 Jun 2021 10:08:41 +0000 (06:08 -0400)
committer GitHub <noreply@github.com>
Wed, 23 Jun 2021 10:08:41 +0000 (06:08 -0400)
diff --cc doc/user/basic.rst
Simple merge
diff --cc lib/compiler.h
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Wed, 23 Jun 2021 10:08:41 +0000 (06:08 -0400)
committer	GitHub <noreply@github.com>
	Wed, 23 Jun 2021 10:08:41 +0000 (06:08 -0400)
		1	2
doc/user/basic.rst	patch \|	diff1 \|	diff2 \|	blob \| history
lib/compiler.h	patch \|	diff1 \|	diff2 \|	blob \| history