]> git.proxmox.com Git - mirror_frr.git/commitdiff
projects / mirror_frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72f5fca 2aab8d2)
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorDinesh G Dutt <ddutt@cumulusnetworks.com>
Wed, 26 Aug 2015 17:58:56 +0000 (10:58 -0700)
committerDinesh G Dutt <ddutt@cumulusnetworks.com>
Wed, 26 Aug 2015 17:58:56 +0000 (10:58 -0700)
1  2 
bgpd/bgpd.c patch | diff1 | diff2 | blob | history

diff --cc bgpd/bgpd.c
Simple merge
FRRouting mirror