]> git.proxmox.com Git - mirror_frr.git/commit
Merge branch 'master' of https://github.com/frrouting/frr into evpn-ipv6-tenant-routing
authorvivek <vivek@cumulusnetworks.com>
Tue, 6 Mar 2018 22:19:24 +0000 (22:19 +0000)
committervivek <vivek@cumulusnetworks.com>
Tue, 6 Mar 2018 22:19:24 +0000 (22:19 +0000)
commitbfd498f0dab9a1937c6036cd35ed020b64a69e8f
treedfb478c984f1aeb74f0c35c9c7b8b11577cb9833
parent558283638bb50ff24ea28bab89c1bb4c89ccc3dd
parentdefd0965f4a85a392e29032f712617e3c617596d
Merge branch 'master' of https://github.com/frrouting/frr into evpn-ipv6-tenant-routing

Conflicts:
zebra/zserv.c
bgpd/bgp_evpn.c
lib/ipaddr.h
zebra/zebra_rib.c
zebra/zserv.c