Merge pull request #2595 from pguibert6WIND/fix_netlink_rx_route_vrfnetns

author Donald Sharp <sharpd@cumulusnetworks.com>

Fri, 13 Jul 2018 02:22:34 +0000 (22:22 -0400)

committer GitHub <noreply@github.com>

Fri, 13 Jul 2018 02:22:34 +0000 (22:22 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Fri, 13 Jul 2018 02:22:34 +0000 (22:22 -0400)
committer GitHub <noreply@github.com>
Fri, 13 Jul 2018 02:22:34 +0000 (22:22 -0400)
diff --cc zebra/rt_netlink.c
Simple merge
diff --cc zebra/zapi_msg.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Fri, 13 Jul 2018 02:22:34 +0000 (22:22 -0400)
committer	GitHub <noreply@github.com>
	Fri, 13 Jul 2018 02:22:34 +0000 (22:22 -0400)
		1	2
zebra/rt_netlink.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zapi_msg.c	patch \|	diff1 \|	diff2 \|	blob \| history