]> git.puffer.fish Git - mirror/frr.git/commit
Merge commit '3d22338f04d9554fa' into evpn-prep
authorDavid Lamparter <equinox@opensourcerouting.org>
Mon, 10 Jul 2017 20:15:19 +0000 (22:15 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Mon, 10 Jul 2017 20:15:19 +0000 (22:15 +0200)
commit21bb7c877480d911486a389cb67f8ee318306e38
tree01c7a558a0549eab069fde6695d5e04a80460383
parentbe2ddfff10343de8cb2e357f1052ffb2448ea830
parent3d22338f04d9554fa79fc993da95868921777354
Merge commit '3d22338f04d9554fa' into evpn-prep

Conflicts:
lib/Makefile.am

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
12 files changed:
bgpd/bgp_evpn.c
bgpd/bgp_packet.c
bgpd/bgp_route.c
bgpd/bgpd.c
bgpd/bgpd.h
lib/Makefile.am
lib/hash.h
lib/prefix.c
lib/prefix.h
zebra/if_netlink.c
zebra/kernel_netlink.c
zebra/rt_netlink.c