Merge pull request #3630 from opensourcerouting/fix-show-import-check

author Donald Sharp <sharpd@cumulusnetworks.com>

Wed, 23 Jan 2019 01:10:56 +0000 (20:10 -0500)

committer GitHub <noreply@github.com>

Wed, 23 Jan 2019 01:10:56 +0000 (20:10 -0500)
author Donald Sharp <sharpd@cumulusnetworks.com>
Wed, 23 Jan 2019 01:10:56 +0000 (20:10 -0500)
committer GitHub <noreply@github.com>
Wed, 23 Jan 2019 01:10:56 +0000 (20:10 -0500)
diff --cc zebra/zapi_msg.c
Simple merge
diff --cc zebra/zebra_rib.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Wed, 23 Jan 2019 01:10:56 +0000 (20:10 -0500)
committer	GitHub <noreply@github.com>
	Wed, 23 Jan 2019 01:10:56 +0000 (20:10 -0500)
		1	2
zebra/zapi_msg.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_rib.c	patch \|	diff1 \|	diff2 \|	blob \| history