]> git.proxmox.com Git - mirror_frr.git/commitdiff
projects / mirror_frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0645185 ef57f35)
Merge branch 'pull/3165'
authorDavid Lamparter <equinox@opensourcerouting.org>
Tue, 23 Oct 2018 10:42:42 +0000 (12:42 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Tue, 23 Oct 2018 10:42:42 +0000 (12:42 +0200)
...with an additional comment.

Signed-off-by: David Lamparter <equinox@diac24.net>
1  2 
zebra/zebra_rib.c patch | diff1 | diff2 | blob | history

diff --cc zebra/zebra_rib.c
Simple merge
FRRouting mirror