git.proxmox.com Git - mirror_frr.git/commit - zebra/zebra_router.h

]> git.proxmox.com Git - mirror_frr.git/commit - zebra/zebra_router.h

projects / mirror_frr.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0fb2ad0 8db37bf)

author	Tuetuopay <tuetuopay@me.com>
	Thu, 28 Mar 2019 17:41:38 +0000 (18:41 +0100)
committer	GitHub <noreply@github.com>
	Thu, 28 Mar 2019 17:41:38 +0000 (18:41 +0100)
commit	d074383c621d904847d6c1cdf1e4d8825caf14ba
tree	b0449b0bc79226875a2c2d4586ccbdd102ddaca4	tree
parent	0fb2ad05d9e11a211915208e3fa648c8e170e31e	commit \| diff
parent	8db37bf14a28ccf89d891fe094d72c65b389dfd3	commit \| diff

Merge branch 'master' into evpn-session-vrf

12 files changed:

bgpd/bgp_evpn.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_evpn.h	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_evpn_vty.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_main.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/zebra_router.h	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vrf.h	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vty.c	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vxlan.c	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vxlan.h	diff1 \|	diff2 \|	blob \| history

FRRouting mirror