Merge pull request #4731 from mjstapp/fix_redist_update

author Donald Sharp <sharpd@cumulusnetworks.com>

Wed, 18 Sep 2019 23:43:43 +0000 (19:43 -0400)

committer GitHub <noreply@github.com>

Wed, 18 Sep 2019 23:43:43 +0000 (19:43 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Wed, 18 Sep 2019 23:43:43 +0000 (19:43 -0400)
committer GitHub <noreply@github.com>
Wed, 18 Sep 2019 23:43:43 +0000 (19:43 -0400)
diff --cc zebra/zapi_msg.c
Simple merge
diff --cc zebra/zebra_rib.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Wed, 18 Sep 2019 23:43:43 +0000 (19:43 -0400)
committer	GitHub <noreply@github.com>
	Wed, 18 Sep 2019 23:43:43 +0000 (19:43 -0400)
		1	2
zebra/zapi_msg.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_rib.c	patch \|	diff1 \|	diff2 \|	blob \| history