Merge remote-tracking branch 'origin/master' into rem_wildcard_child (7e20800f) · Commits · Daniel Kahn Gillmor / 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 7e20800f authored 10 years ago by

Jan Kadlec

Browse files

Merge remote-tracking branch 'origin/master' into rem_wildcard_child

Conflicts:
	src/knot/zone/node.c
	src/knot/zone/node.h
	src/knot/zone/zone-contents.c
	src/knot/zone/zone-contents.h

parents 9dfa76b8 dff308aa

Branches

Admin message

Admin message

Merge remote-tracking branch 'origin/master' into rem_wildcard_child