Merge pull request #3448 from chiragshah6/evpn_dev1

author Sri Mohana Singamsetty <srimohans@gmail.com>

Wed, 19 Dec 2018 02:12:18 +0000 (18:12 -0800)

committer GitHub <noreply@github.com>

Wed, 19 Dec 2018 02:12:18 +0000 (18:12 -0800)
author Sri Mohana Singamsetty <srimohans@gmail.com>
Wed, 19 Dec 2018 02:12:18 +0000 (18:12 -0800)
committer GitHub <noreply@github.com>
Wed, 19 Dec 2018 02:12:18 +0000 (18:12 -0800)
diff --cc bgpd/bgp_evpn.c
Simple merge
diff --cc bgpd/bgp_evpn_vty.c
Simple merge
author	Sri Mohana Singamsetty <srimohans@gmail.com>
	Wed, 19 Dec 2018 02:12:18 +0000 (18:12 -0800)
committer	GitHub <noreply@github.com>
	Wed, 19 Dec 2018 02:12:18 +0000 (18:12 -0800)
		1	2
bgpd/bgp_evpn.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_evpn_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history