]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #1987 from donaldsharp/zserv_read_fix
authorRuss White <russ@riw.us>
Fri, 30 Mar 2018 13:37:51 +0000 (09:37 -0400)
committerGitHub <noreply@github.com>
Fri, 30 Mar 2018 13:37:51 +0000 (09:37 -0400)
two zebra changes

1  2 
zebra/zserv.c

diff --cc zebra/zserv.c
Simple merge