]> git.puffer.fish Git - mirror/frr.git/commit
Merge branch 'master' of https://github.com/frrouting/frr into evpn-ipv6-tenant-routing 1806/head
authorvivek <vivek@cumulusnetworks.com>
Sat, 10 Mar 2018 04:03:41 +0000 (04:03 +0000)
committervivek <vivek@cumulusnetworks.com>
Sat, 10 Mar 2018 04:03:41 +0000 (04:03 +0000)
commit4e262455a252c700f81df75fb8107d112062bba8
treefbd55c66eebe78ccb60424e560548d1613aa403a
parentbfd498f0dab9a1937c6036cd35ed020b64a69e8f
parent58e7db106d5907cb129fcc316f02ce0bf34e3885
Merge branch 'master' of https://github.com/frrouting/frr into evpn-ipv6-tenant-routing

Conflicts:
bgpd/bgp_evpn.c
bgpd/bgp_evpn.c
bgpd/bgp_evpn_vty.c
zebra/zebra_rib.c
zebra/zserv.c