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: 6b3ee3a 126ee21)

author	Mitesh Kanjariya <mitesh@cumulusnetworks.com>
	Tue, 29 Aug 2017 01:19:03 +0000 (18:19 -0700)
committer	GitHub <noreply@github.com>
	Tue, 29 Aug 2017 01:19:03 +0000 (18:19 -0700)
commit	09fdc88c8cb0cd4169ae97b652d82f6a174a4041
tree	ce312038b12ce5128d375fa075c52ce30cf64207	tree
parent	6b3ee3a0b013e580abbce83ae46e4ed2bcf5f7a7	commit \| diff
parent	126ee21d2ed9451aefab869c482bb28c6b4f6085	commit \| diff

Merge branch 'master' into dev-master

bgpd/bgp_route.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_route.h	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_vty.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.h	diff1 \|	diff2 \|	blob \| history
isisd/isisd.c	diff1 \|	diff2 \|	blob \| history
lib/command.c	diff1 \|	diff2 \|	blob \| history
vtysh/vtysh.c	diff1 \|	diff2 \|	blob \| history
vtysh/vtysh_config.c	diff1 \|	diff2 \|	blob \| history
zebra/interface.c	diff1 \|	diff2 \|	blob \| history

FRRouting mirror