Merge branch 'new-rrset' of git+ssh://git.nic.cz/knot into new-rrset
Conflicts: src/libknot/rrset.c
Showing
- Knot.files 2 additions, 2 deletionsKnot.files
- configure.ac 3 additions, 3 deletionsconfigure.ac
- src/Makefile.am 3 additions, 1 deletionsrc/Makefile.am
- src/common/acl.h 1 addition, 1 deletionsrc/common/acl.h
- src/common/descriptor_new.c 4 additions, 2 deletionssrc/common/descriptor_new.c
- src/common/fdset.h 8 additions, 1 deletionsrc/common/fdset.h
- src/common/getline_wrap.c 71 additions, 0 deletionssrc/common/getline_wrap.c
- src/common/getline_wrap.h 47 additions, 0 deletionssrc/common/getline_wrap.h
- src/common/hattrie/hat-trie.h 1 addition, 1 deletionsrc/common/hattrie/hat-trie.h
- src/common/prng.c 9 additions, 9 deletionssrc/common/prng.c
- src/knot/conf/conf.c 4 additions, 0 deletionssrc/knot/conf/conf.c
- src/knot/ctl/knotc_main.c 1 addition, 1 deletionsrc/knot/ctl/knotc_main.c
- src/knot/ctl/remote.c 1 addition, 1 deletionsrc/knot/ctl/remote.c
- src/knot/main.c 0 additions, 1 deletionsrc/knot/main.c
- src/knot/server/dthreads.c 1 addition, 4 deletionssrc/knot/server/dthreads.c
- src/knot/server/server.c 16 additions, 0 deletionssrc/knot/server/server.c
- src/knot/server/zones.c 1 addition, 1 deletionsrc/knot/server/zones.c
- src/knot/zone/zone-load.c 11 additions, 11 deletionssrc/knot/zone/zone-load.c
- src/libknot/hash/cuckoo-hash-table.c 33 additions, 12 deletionssrc/libknot/hash/cuckoo-hash-table.c
- src/libknot/packet/packet.c 5 additions, 6 deletionssrc/libknot/packet/packet.c
Please register or sign in to comment