Merge pull request #3923 from Tuetuopay/evpn-session-vrf

author Donald Sharp <sharpd@cumulusnetworks.com>

Wed, 3 Apr 2019 12:00:14 +0000 (08:00 -0400)

committer GitHub <noreply@github.com>

Wed, 3 Apr 2019 12:00:14 +0000 (08:00 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Wed, 3 Apr 2019 12:00:14 +0000 (08:00 -0400)
committer GitHub <noreply@github.com>
Wed, 3 Apr 2019 12:00:14 +0000 (08:00 -0400)
diff --cc bgpd/bgpd.c
Simple merge
diff --cc zebra/zebra_vxlan.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Wed, 3 Apr 2019 12:00:14 +0000 (08:00 -0400)
committer	GitHub <noreply@github.com>
	Wed, 3 Apr 2019 12:00:14 +0000 (08:00 -0400)
		1	2
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vxlan.c	patch \|	diff1 \|	diff2 \|	blob \| history