]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge branch 'master' into evpn-bug-fixes
authorMitesh Kanjariya <mitesh@cumulusnetworks.com>
Tue, 27 Feb 2018 10:47:36 +0000 (02:47 -0800)
committerGitHub <noreply@github.com>
Tue, 27 Feb 2018 10:47:36 +0000 (02:47 -0800)
1  2 
bgpd/bgp_evpn.c
zebra/zebra_vxlan.c

diff --cc bgpd/bgp_evpn.c
Simple merge
Simple merge