git.puffer.fish Git - mirror/frr.git/commit

]> git.puffer.fish Git - mirror/frr.git/commit

projects / mirror / frr.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8c19712 eef83e9)

author	Donald Sharp <sharpd@cumulusnetworks.com>
	Fri, 14 Jul 2017 12:11:05 +0000 (08:11 -0400)
committer	Donald Sharp <sharpd@cumulusnetworks.com>
	Fri, 14 Jul 2017 12:11:05 +0000 (08:11 -0400)
commit	da571b7a6c5326447399ff78439c87639fa51e19
tree	c34078577275b7e3105d66b7d1364582529e580d	tree \| snapshot
parent	8c19712819711a8fa09770b500963250e55cf9c9	commit \| diff
parent	eef83e96f7141c8b016462195e01b824c600c89e	commit \| diff

Merge remote-tracking branch 'origin/master' into evpn_plus_struct_attr

19 files changed:

bgpd/bgp_debug.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_route.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_routemap.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/rfapi/rfapi.c	diff1 \|	diff2 \|	blob \| history
bgpd/rfapi/rfapi_vty.c	diff1 \|	diff2 \|	blob \| history
lib/command.c	diff1 \|	diff2 \|	blob \| history
lib/command.h	diff1 \|	diff2 \|	blob \| history
lib/vty.c	diff1 \|	diff2 \|	blob \| history
vtysh/vtysh.c	diff1 \|	diff2 \|	blob \| history
zebra/Makefile.am	diff1 \|	diff2 \|	blob \| history
zebra/debug.c	diff1 \|	diff2 \|	blob \| history
zebra/interface.c	diff1 \|	diff2 \|	blob \| history
zebra/rt_netlink.c	diff1 \|	diff2 \|	blob \| history
zebra/rt_socket.c	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vty.c	diff1 \|	diff2 \|	blob \| history
zebra/zserv.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.