]> git.proxmox.com Git - mirror_frr.git/commitdiff
projects / mirror_frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2d7c08 55ce4d3)
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 8 Apr 2016 17:16:21 +0000 (13:16 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 8 Apr 2016 17:16:21 +0000 (13:16 -0400)
1  2 
zebra/interface.c patch | diff1 | diff2 | blob | history

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