Merge pull request #4763 from opensourcerouting/ds-work

author Donald Sharp <sharpd@cumulusnetworks.com>

Wed, 7 Aug 2019 20:45:02 +0000 (16:45 -0400)

committer GitHub <noreply@github.com>

Wed, 7 Aug 2019 20:45:02 +0000 (16:45 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Wed, 7 Aug 2019 20:45:02 +0000 (16:45 -0400)
committer GitHub <noreply@github.com>
Wed, 7 Aug 2019 20:45:02 +0000 (16:45 -0400)
diff --cc lib/subdir.am
Simple merge
diff --cc tests/lib/cxxcompat.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Wed, 7 Aug 2019 20:45:02 +0000 (16:45 -0400)
committer	GitHub <noreply@github.com>
	Wed, 7 Aug 2019 20:45:02 +0000 (16:45 -0400)
		1	2
lib/subdir.am	patch \|	diff1 \|	diff2 \|	blob \| history
tests/lib/cxxcompat.c	patch \|	diff1 \|	diff2 \|	blob \| history