Merge branch 'master' into hashtable_unify (474e59cf) · Commits · Kamil Sopko / Knot DNS

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Self sign-up has been disabled due to increased spam activity. If you want to get access, please send an email to a project owner (preferred) or at gitlab(at)nic(dot)cz. We apologize for the inconvenience.

Commit 474e59cf authored 11 years ago by

Marek Vavrusa

Browse files

Merge branch 'master' into hashtable_unify

Conflicts:
	Knot.files
	src/common/hattrie/ahtable.c
	src/common/hattrie/ahtable.h
	src/common/hattrie/hat-trie.c
	src/common/hattrie/hat-trie.h
	src/knot/zone/estimator.c
	src/libknot/dnssec/zone-sign.c
	src/tests/Makefile.am
	src/tests/unittests_main.c
	tests/hattrie.c

parents 80f0e519 1e16efe4

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 237 additions and 114 deletions

Please register or to comment

Admin message

Admin message

Merge branch 'master' into hashtable_unify