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: 523cafc c124004)

author	Mitesh Kanjariya <mitesh@cumulusnetworks.com>
	Thu, 11 Jan 2018 17:00:23 +0000 (09:00 -0800)
committer	GitHub <noreply@github.com>
	Thu, 11 Jan 2018 17:00:23 +0000 (09:00 -0800)
commit	9bb77a5b3dec12a71ef816699e491e2b832343ec
tree	e046f33132343f975e28bfcf2b9999c69a1c70eb	tree
parent	523cafc4181b4d9f26147d44f71ba0d9b7adef53	commit \| diff
parent	c1240044fbf081bb7407b1449d3954e4b63fec9f	commit \| diff

Merge branch 'master' into evpn-symmetric-routing

14 files changed:

bgpd/bgp_attr.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_evpn.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_evpn_vty.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_route.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_vty.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_zebra.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.h	diff1 \|	diff2 \|	blob \| history
zebra/connected.c	diff1 \|	diff2 \|	blob \| history
zebra/kernel_socket.c	diff1 \|	diff2 \|	blob \| history
zebra/rib.h	diff1 \|	diff2 \|	blob \| history
zebra/rt_netlink.c	diff1 \|	diff2 \|	blob \| history
zebra/zebra_rib.c	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vty.c	diff1 \|	diff2 \|	blob \| history

FRRouting mirror