Merge pull request #1915 from vivek-cumulus/evpn-ipv6-external-routing

author Philippe Guibert <philippe.guibert@6wind.com>

Tue, 27 Mar 2018 15:32:06 +0000 (17:32 +0200)

committer GitHub <noreply@github.com>

Tue, 27 Mar 2018 15:32:06 +0000 (17:32 +0200)
author Philippe Guibert <philippe.guibert@6wind.com>
Tue, 27 Mar 2018 15:32:06 +0000 (17:32 +0200)
committer GitHub <noreply@github.com>
Tue, 27 Mar 2018 15:32:06 +0000 (17:32 +0200)
diff --cc bgpd/bgp_evpn.c
Simple merge
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc bgpd/bgp_zebra.c
Simple merge
author	Philippe Guibert <philippe.guibert@6wind.com>
	Tue, 27 Mar 2018 15:32:06 +0000 (17:32 +0200)
committer	GitHub <noreply@github.com>
	Tue, 27 Mar 2018 15:32:06 +0000 (17:32 +0200)
		1	2
bgpd/bgp_evpn.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_zebra.c	patch \|	diff1 \|	diff2 \|	blob \| history