Module Name: src
Committed By: christos
Date: Mon Mar 15 19:48:52 UTC 2021
Modified Files:
src/external/bsd/nsd: Makefile.inc
src/external/bsd/nsd/dist: configlexer.c configparser.c configparser.h
configure.ac options.c server.c util.h zlexer.c zparser.c zparser.h
src/external/bsd/nsd/include: config.h
src/external/bsd/nsd/lib/libnsd: Makefile
Removed Files:
src/external/bsd/nsd/dist: .travis.yml
src/external/bsd/nsd/dist/.buildkite: pipeline.yml
src/external/bsd/nsd/dist/contrib: nsd.service
Log Message:
merge conflicts between our changes for nsd between 4.2.4 and 4.3.5
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/nsd/Makefile.inc
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/nsd/dist/.travis.yml
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/nsd/dist/configlexer.c \
src/external/bsd/nsd/dist/configparser.c \
src/external/bsd/nsd/dist/configparser.h \
src/external/bsd/nsd/dist/zparser.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nsd/dist/configure.ac
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/dist/options.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nsd/dist/server.c \
src/external/bsd/nsd/dist/util.h src/external/bsd/nsd/dist/zlexer.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nsd/dist/zparser.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/nsd/dist/.buildkite/pipeline.yml
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/nsd/dist/contrib/nsd.service
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/nsd/include/config.h
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/lib/libnsd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
