luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Revert "doc: address review comment" 

This reverts commit 6ba9690e812089ba3dbda43f17e6b862201d16a8.
This commit is contained in:
Frank Schroeder 2017-10-23 10:08:35 +02:00
parent fca7ba5494
commit 816d4b762f
No known key found for this signature in database
GPG Key ID: 4D65C6EAEC87DECD
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
website/source/docs/agent/options.html.md
View File

@ -1037,8 +1037,8 @@ Consul will not enable TLS for the HTTP API unless the `https` port has been ass
upstream DNS servers that are used to recursively resolve queries if they are not inside the service upstream DNS servers that are used to recursively resolve queries if they are not inside the service
domain for Consul. For example, a node can use Consul directly as a DNS server, and if the record is domain for Consul. For example, a node can use Consul directly as a DNS server, and if the record is
outside of the "consul." domain, the query will be resolved upstream. As of Consul 1.0.1 recursors outside of the "consul." domain, the query will be resolved upstream. As of Consul 1.0.1 recursors
can be provided as ip addresses or as go-sockaddr templates. IP addresses are resolved in order, can be provided as ip addresses or as go-sockaddr templates. The list of ip addresses is deduplicated
and duplicates are ignored. while the original order is maintained.
* <a name="rejoin_after_leave"></a><a href="#rejoin_after_leave">`rejoin_after_leave`</a> Equivalent * <a name="rejoin_after_leave"></a><a href="#rejoin_after_leave">`rejoin_after_leave`</a> Equivalent
to the [`-rejoin` command-line flag](#_rejoin). to the [`-rejoin` command-line flag](#_rejoin).