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: cea3472 ad2e247)

author	David Lamparter <equinox@opensourcerouting.org>
	Tue, 13 Jun 2017 07:18:14 +0000 (09:18 +0200)
committer	David Lamparter <equinox@opensourcerouting.org>
	Tue, 13 Jun 2017 07:18:14 +0000 (09:18 +0200)
commit	97bd5c48de49f1a25c6fb979f0ca151412fbd61b
tree	924b30812e7ae8d9d2f7c897b4ebbbf19802eff8	tree \| snapshot
parent	cea34723daeb767a5b92fa5800ebed81e3f690b6	commit \| diff
parent	ad2e2470f63e3fac228b6cc532dfe36a0794a846	commit \| diff

Merge remote-tracking branch 'frr/master' into pull-624

configure.ac	diff1 \|	diff2 \|	blob \| history
lib/command.c	diff1 \|	diff2 \|	blob \| history
lib/route_types.txt	diff1 \|	diff2 \|	blob \| history
lib/zclient.c	diff1 \|	diff2 \|	blob \| history
tools/etc/iproute2/rt_protos.d/frr.conf	diff1 \|	diff2 \|	blob \| history
vtysh/vtysh.c	diff1 \|	diff2 \|	blob \| history
vtysh/vtysh_config.c	diff1 \|	diff2 \|	blob \| history
zebra/rt_netlink.c	diff1 \|	diff2 \|	blob \| history
zebra/rt_netlink.h	diff1 \|	diff2 \|	blob \| history
zebra/zebra_rib.c	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vty.c	diff1 \|	diff2 \|	blob \| history

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