]> git.puffer.fish Git - matthieu/frr.git/commit
projects / matthieu / frr.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 364fed6 7aab2af)
Merge remote-tracking branch 'frr/master' into warnings
authorDavid Lamparter <equinox@opensourcerouting.org>
Wed, 12 Sep 2018 19:58:39 +0000 (21:58 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Wed, 12 Sep 2018 19:58:39 +0000 (21:58 +0200)
commite991eff5b5773e8a85c3f4c4f92c09fe30cf680b
treeab98bf44cfc7611ad7cc699396674554f150db43tree | snapshot
parent364fed6b074a702f21e190cb7aff33e13c65e808commit | diff
parent7aab2afbad2f25c128e9e608766b407f6bd34c89commit | diff
Merge remote-tracking branch 'frr/master' into warnings

Conflicts:
zebra/if_ioctl_solaris.c
zebra/rtread_getmsg.c

Signed-off-by: David Lamparter <equinox@diac24.net>
13 files changed:
lib/lib_errors.c diff1 | diff2 | blob | history
lib/libfrr.c diff1 | diff2 | blob | history
lib/stream.c diff1 | diff2 | blob | history
lib/vrf.c diff1 | diff2 | blob | history
lib/vty.c diff1 | diff2 | blob | history
ospfd/ospf_sr.c diff1 | diff2 | blob | history
zebra/if_ioctl_solaris.c diff1 | diff2 | blob | history
zebra/if_netlink.c diff1 | diff2 | blob | history
zebra/interface.c diff1 | diff2 | blob | history
zebra/rt_netlink.c diff1 | diff2 | blob | history
zebra/rtread_getmsg.c diff1 | diff2 | blob | history
zebra/zebra_rib.c diff1 | diff2 | blob | history
zebra/zebra_vxlan.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.