Merge remote branch 'origin/pollapi' into debug
Conflicts: libknot/nameserver/name-server.c src/knot/other/debug.h
No related branches found
No related tags found
Showing
- INSTALL 186 additions, 57 deletionsINSTALL
- Knot.files 2 additions, 0 deletionsKnot.files
- configure.ac 20 additions, 1 deletionconfigure.ac
- libknot/dname.c 3 additions, 3 deletionslibknot/dname.c
- libknot/hash/cuckoo-hash-table.c 1 addition, 1 deletionlibknot/hash/cuckoo-hash-table.c
- libknot/nameserver/name-server.c 21 additions, 22 deletionslibknot/nameserver/name-server.c
- libknot/packet/packet.c 4 additions, 4 deletionslibknot/packet/packet.c
- libknot/packet/response.c 6 additions, 6 deletionslibknot/packet/response.c
- libknot/updates/xfr-in.c 9 additions, 9 deletionslibknot/updates/xfr-in.c
- libknot/util/debug.h 533 additions, 47 deletionslibknot/util/debug.h
- libknot/zone/zone-contents.c 16 additions, 16 deletionslibknot/zone/zone-contents.c
- libknot/zone/zone.c 1 addition, 1 deletionlibknot/zone/zone.c
- libknot/zone/zonedb.c 4 additions, 4 deletionslibknot/zone/zonedb.c
- src/Makefile.am 2 additions, 0 deletionssrc/Makefile.am
- src/common/fdset.c 14 additions, 24 deletionssrc/common/fdset.c
- src/common/fdset_epoll.c 4 additions, 2 deletionssrc/common/fdset_epoll.c
- src/common/fdset_epoll.h 118 additions, 0 deletionssrc/common/fdset_epoll.h
- src/common/fdset_kqueue.c 234 additions, 0 deletionssrc/common/fdset_kqueue.c
- src/common/fdset_kqueue.h 118 additions, 0 deletionssrc/common/fdset_kqueue.h
- src/common/fdset_poll.c 4 additions, 2 deletionssrc/common/fdset_poll.c
Loading
Please register or sign in to comment