]> git.puffer.fish Git - mirror/frr.git/commitdiff
projects / mirror / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70d43d7 8da4e94)
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 20 Nov 2015 15:12:30 +0000 (07:12 -0800)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 20 Nov 2015 15:12:30 +0000 (07:12 -0800)
1  2 
zebra/interface.c patch | diff1 | diff2 | blob | history

diff --cc zebra/interface.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.