]> git.proxmox.com Git - mirror_frr.git/commit
Merge branch 'frr/pull/569'
authorDavid Lamparter <equinox@opensourcerouting.org>
Thu, 18 May 2017 10:34:34 +0000 (12:34 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Thu, 18 May 2017 10:34:34 +0000 (12:34 +0200)
commite2f30ad1c2087caf09cf163c7688750995733e04
treed040c20d240161df51c234e1bbed3d6da517ba92
parent20ae26767d46289ad843e2ad87e93fafcf8bebc7
parent201c3dac294e15ecc6673d88f5ca9c1842a71f88
Merge branch 'frr/pull/569'

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
bgpd/bgp_encap.c
bgpd/bgp_evpn_vty.c
bgpd/bgp_mplsvpn.c
bgpd/bgp_route.c
bgpd/bgp_route.h