Merge pull request #3633 from opensourcerouting/send-vrf-backend

author Donald Sharp <sharpd@cumulusnetworks.com>

Tue, 22 Jan 2019 14:11:58 +0000 (09:11 -0500)

committer GitHub <noreply@github.com>

Tue, 22 Jan 2019 14:11:58 +0000 (09:11 -0500)
author Donald Sharp <sharpd@cumulusnetworks.com>
Tue, 22 Jan 2019 14:11:58 +0000 (09:11 -0500)
committer GitHub <noreply@github.com>
Tue, 22 Jan 2019 14:11:58 +0000 (09:11 -0500)
diff --cc lib/zclient.c
Simple merge
diff --cc zebra/zapi_msg.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Tue, 22 Jan 2019 14:11:58 +0000 (09:11 -0500)
committer	GitHub <noreply@github.com>
	Tue, 22 Jan 2019 14:11:58 +0000 (09:11 -0500)
		1	2
lib/zclient.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zapi_msg.c	patch \|	diff1 \|	diff2 \|	blob \| history