Merge pull request #3931 from chiragshah6/evpn_dev1

author Russ White <russ@riw.us>

Tue, 2 Apr 2019 15:59:35 +0000 (11:59 -0400)

committer GitHub <noreply@github.com>

Tue, 2 Apr 2019 15:59:35 +0000 (11:59 -0400)
author Russ White <russ@riw.us>
Tue, 2 Apr 2019 15:59:35 +0000 (11:59 -0400)
committer GitHub <noreply@github.com>
Tue, 2 Apr 2019 15:59:35 +0000 (11:59 -0400)
diff --cc bgpd/bgp_mplsvpn.c
Simple merge
diff --cc bgpd/bgp_mplsvpn.h
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
author	Russ White <russ@riw.us>
	Tue, 2 Apr 2019 15:59:35 +0000 (11:59 -0400)
committer	GitHub <noreply@github.com>
	Tue, 2 Apr 2019 15:59:35 +0000 (11:59 -0400)
		1	2
bgpd/bgp_mplsvpn.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_mplsvpn.h	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history