• Marek Vavruša's avatar
    Merge branch 'master' into new_node · 6489550a
    Marek Vavruša authored
    Conflicts:
    	src/knot/dnssec/zone-sign.c
    	src/knot/updates/ddns.c
    	src/knot/updates/xfr-in.c
    	src/knot/zone/node.c
    	src/knot/zone/node.h
    	src/knot/zone/semantic-check.c
    	src/knot/zone/zone-contents.c
    	src/knot/zone/zone-contents.h
    	src/knot/zone/zone-create.c
    	src/libknot/rrset.c
    	tests-extra/tests/ddns/basic/test.py
    
    Note: ddns/basic fails now, but I don't think it's caused by my merge
    jutsu.
    6489550a
Name
Last commit
Last update
..
hattrie Loading commit data...
slab Loading commit data...
LICENSE.txt Loading commit data...
array-sort.h Loading commit data...
base32hex.c Loading commit data...
base32hex.h Loading commit data...
base64.c Loading commit data...
base64.h Loading commit data...
binsearch.h Loading commit data...
crc.h Loading commit data...
debug.h Loading commit data...
descriptor.c Loading commit data...
descriptor.h Loading commit data...
errcode.c Loading commit data...
errcode.h Loading commit data...
errors.c Loading commit data...
errors.h Loading commit data...
evsched.c Loading commit data...
evsched.h Loading commit data...
fdset.c Loading commit data...
fdset.h Loading commit data...
getline.c Loading commit data...
getline.h Loading commit data...
heap.c Loading commit data...
heap.h Loading commit data...
hex.c Loading commit data...
hex.h Loading commit data...
hhash.c Loading commit data...
hhash.h Loading commit data...
lists.c Loading commit data...
lists.h Loading commit data...
log.c Loading commit data...
log.h Loading commit data...
memdup.h Loading commit data...
mempattern.c Loading commit data...
mempattern.h Loading commit data...
mempool.c Loading commit data...
mempool.h Loading commit data...
print.c Loading commit data...
print.h Loading commit data...
ref.c Loading commit data...
ref.h Loading commit data...
sockaddr.c Loading commit data...
sockaddr.h Loading commit data...
strtonum.h Loading commit data...