This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 20a72cd Clarify relation of nameservers and resolv.conf
20a72cd is described below
commit 20a72cdbea59bc86301d61003dc195547e4f07f4
Author: Miles Libbey <[email protected]>
AuthorDate: Mon Oct 21 13:49:23 2019 -0700
Clarify relation of nameservers and resolv.conf
Clarifying the behavior here.
(cherry picked from commit 2888052d71c9c192eec96cdbff20f0c6b1076c7e)
Conflicts:
doc/admin-guide/files/records.config.en.rst
---
doc/admin-guide/files/records.config.en.rst | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/doc/admin-guide/files/records.config.en.rst
b/doc/admin-guide/files/records.config.en.rst
index 5e60598..5c48243 100644
--- a/doc/admin-guide/files/records.config.en.rst
+++ b/doc/admin-guide/files/records.config.en.rst
@@ -335,7 +335,7 @@ Thread Variables
``0`` ``1`` All worker threads listen on
the same port using SO_REUSEPORT. Each thread has its own listen fd and new
connections are accepted on all the threads.
==================== ====================== =====================
- By default, `proxy.config.accept_threads` is set to 1 and
`proxy.config.exec_thread.listen` is set to 0.
+ By default, `proxy.config.accept_threads` is set to 1 and
`proxy.config.exec_thread.listen` is set to 0.
.. ts:cv:: CONFIG proxy.config.thread.default.stacksize INT 1048576
Default thread stack size, in bytes, for all threads (default is 1 MB).
@@ -2452,7 +2452,8 @@ DNS
Allows one to specify which ``resolv.conf`` file to use for finding
resolvers. While the format of this file must be the same as the
standard ``resolv.conf`` file, this option allows an administrator to
manage the set of resolvers in an external configuration file,
- without affecting how the rest of the operating system uses DNS.
+ without affecting how the rest of the operating system uses DNS. Note that
this setting works in conjunction with
+ :ts:cv:`proxy.config.dns.nameservers`, with its settings appended to the
``resolv.conf`` contents.
.. ts:cv:: CONFIG proxy.config.dns.round_robin_nameservers INT 1
:reloadable:
