]> git.proxmox.com Git - mirror_frr.git/commit
Merge remote-tracking branch 'upstream/master' into evpn-extended-mobility
authorvivek <vivek@cumulusnetworks.com>
Mon, 27 Aug 2018 22:13:30 +0000 (22:13 +0000)
committervivek <vivek@cumulusnetworks.com>
Mon, 27 Aug 2018 22:13:30 +0000 (22:13 +0000)
commitf190902f523abaa1035cbbb385387bc6c72dd1dc
tree9472de5fb49314eba45868ed7b66376f7329b2fe
parent9df2b997b975c7a7807e9e491989d5123d87458f
parent95d8c3ce78cdd800f4c39d196e865c2ec9213f03
Merge remote-tracking branch 'upstream/master' into evpn-extended-mobility

Conflicts:
zebra/zebra_vxlan.c
bgpd/bgp_evpn.c
bgpd/bgp_zebra.c
zebra/zebra_vxlan.c