]> git.proxmox.com Git - mirror_frr.git/commit - debianpkg/control
Merge branch 'master' into working/master/bgp-vpn-vrf-leaking
authorpaulzlabn <paulz@labn.net>
Wed, 14 Mar 2018 20:31:58 +0000 (13:31 -0700)
committerGitHub <noreply@github.com>
Wed, 14 Mar 2018 20:31:58 +0000 (13:31 -0700)
commit3f1224cd1a9408bdad6aca8c0c205211cb548d5c
tree87e6a52a3e7ad7b09caa3207f081fd92bc8fd018
parentfd9b55a2b77c187730600d429b3f290ab58fa035
parent6ca96cc6ada990d052fcfc48cffeef454ae64a10
Merge branch 'master' into working/master/bgp-vpn-vrf-leaking
12 files changed:
bgpd/bgp_debug.c
bgpd/bgp_debug.h
bgpd/bgp_route.c
bgpd/bgp_routemap.c
bgpd/bgpd.c
bgpd/bgpd.h
lib/log.c
lib/zclient.c
vtysh/vtysh.c
zebra/redistribute.c
zebra/zebra_rib.c
zebra/zserv.c