Merge pull request #3688 from chiragshah6/evpn_dev

author Russ White <russ@riw.us>

Tue, 5 Feb 2019 15:48:33 +0000 (10:48 -0500)

committer GitHub <noreply@github.com>

Tue, 5 Feb 2019 15:48:33 +0000 (10:48 -0500)
author Russ White <russ@riw.us>
Tue, 5 Feb 2019 15:48:33 +0000 (10:48 -0500)
committer GitHub <noreply@github.com>
Tue, 5 Feb 2019 15:48:33 +0000 (10:48 -0500)
diff --cc zebra/rt_netlink.c
Simple merge
diff --cc zebra/zebra_vxlan.c
Simple merge
author	Russ White <russ@riw.us>
	Tue, 5 Feb 2019 15:48:33 +0000 (10:48 -0500)
committer	GitHub <noreply@github.com>
	Tue, 5 Feb 2019 15:48:33 +0000 (10:48 -0500)
		1	2
zebra/rt_netlink.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vxlan.c	patch \|	diff1 \|	diff2 \|	blob \| history