]> git.proxmox.com Git - mirror_frr.git/commit
Merge branch 'pr/2986'
authorDavid Lamparter <equinox@opensourcerouting.org>
Tue, 18 Sep 2018 10:46:42 +0000 (12:46 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Tue, 18 Sep 2018 10:46:42 +0000 (12:46 +0200)
commit2564f080da643863d031a39c8079aec9c34718b3
tree51170c64cfbeac5d4131ce710917ae0f11a1985f
parente8275c22b4c5dd5a6ff4a66befb61646e787ed0c
parent17cdd31e00b2ca2763c042a415bfcf03b614a783
Merge branch 'pr/2986'

Conflicts:
bgpd/bgp_network.c (BGP_ERR_* -> EC_BGP_*)

Signed-off-by: David Lamparter <equinox@diac24.net>
bgpd/bgp_attr.c
bgpd/bgp_network.c
bgpd/bgp_zebra.c