Skip to content

Commit

Permalink
Merge branch 'master' into still_alive
Browse files Browse the repository at this point in the history
  • Loading branch information
sepiroth887 committed Oct 7, 2015
2 parents b73451d + c5c9dfb commit 85249b9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docs/docs/naming.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Note that, if you configure Mesos-DNS to detect the leading master through Zooke
If you configure Mesos-DNS using the `masters` field, it will generate master records for every master in the list.
Also note that there is inherent delay between the election of a new master and the update of leader/master records in Mesos-DNS.

Mesos-DNS generates A records for itself that list all the IP addresses that Mesos-DNS is listening to. The name for Mesos-DNS can be selected using the `SOARname` [configuration parameter](configuration-parameters.html). The default name is `ns1.mesos`.
Mesos-DNS generates A records for itself that list all the IP addresses that Mesos-DNS is listening to. The name for Mesos-DNS can be selected using the `SOAMname` [configuration parameter](configuration-parameters.html). The default name is `ns1.mesos`.

In addition to A and SRV records for Mesos tasks, Mesos-DNS supports requests for SOA and NS records for the Mesos domain. DNS requests for records of other types in the Mesos domain will return `NXDOMAIN`. Mesos-DNS does not support PTR records needed fo reserve lookups.

Expand Down

0 comments on commit 85249b9

Please sign in to comment.