Merge remote-tracking branch 'origin/master' into zone-events-queue (4761990e) · 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 4761990e authored 10 years ago by

Jan Kadlec

Browse files

Merge remote-tracking branch 'origin/master' into zone-events-queue

Conflicts:
	src/knot/server/zones.c
	src/knot/server/zones.h
	src/knot/updates/xfr-in.c
	src/knot/zone/contents.c
	src/knot/zone/contents.h
	src/knot/zone/zone-dump.c
	src/knot/zone/zone-dump.h
	src/knot/zone/zonefile.c
	tests/process_query.c

parents 8e40bff3 ed980cf4

Branches

Admin message

Admin message

Merge remote-tracking branch 'origin/master' into zone-events-queue