Merge pull request #1739 from LabNConsulting/working/master/bgp-vpn-vrf-leaking

author Donald Sharp <sharpd@cumulusnetworks.com>

Thu, 15 Mar 2018 13:01:27 +0000 (09:01 -0400)

committer GitHub <noreply@github.com>

Thu, 15 Mar 2018 13:01:27 +0000 (09:01 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Thu, 15 Mar 2018 13:01:27 +0000 (09:01 -0400)
committer GitHub <noreply@github.com>
Thu, 15 Mar 2018 13:01:27 +0000 (09:01 -0400)
diff --cc zebra/zebra_rib.c
Simple merge
diff --cc zebra/zserv.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Thu, 15 Mar 2018 13:01:27 +0000 (09:01 -0400)
committer	GitHub <noreply@github.com>
	Thu, 15 Mar 2018 13:01:27 +0000 (09:01 -0400)
		1	2
zebra/zebra_rib.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zserv.c	patch \|	diff1 \|	diff2 \|	blob \| history