git.proxmox.com Git - mirror_frr.git/commit

]> git.proxmox.com Git - mirror_frr.git/commit

projects / mirror_frr.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fd9b55a 6ca96cc)

author	paulzlabn <paulz@labn.net>
	Wed, 14 Mar 2018 20:31:58 +0000 (13:31 -0700)
committer	GitHub <noreply@github.com>
	Wed, 14 Mar 2018 20:31:58 +0000 (13:31 -0700)
commit	3f1224cd1a9408bdad6aca8c0c205211cb548d5c
tree	87e6a52a3e7ad7b09caa3207f081fd92bc8fd018	tree
parent	fd9b55a2b77c187730600d429b3f290ab58fa035	commit \| diff
parent	6ca96cc6ada990d052fcfc48cffeef454ae64a10	commit \| diff

Merge branch 'master' into working/master/bgp-vpn-vrf-leaking

12 files changed:

bgpd/bgp_debug.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_debug.h	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_route.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_routemap.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.h	diff1 \|	diff2 \|	blob \| history
lib/log.c	diff1 \|	diff2 \|	blob \| history
lib/zclient.c	diff1 \|	diff2 \|	blob \| history
vtysh/vtysh.c	diff1 \|	diff2 \|	blob \| history
zebra/redistribute.c	diff1 \|	diff2 \|	blob \| history
zebra/zebra_rib.c	diff1 \|	diff2 \|	blob \| history
zebra/zserv.c	diff1 \|	diff2 \|	blob \| history

FRRouting mirror