Fix merge conflict

pull/233/head
Armon Dadgar 2014-06-17 12:50:35 -07:00
commit 46d07005a8
1 changed files with 1 additions and 1 deletions

View File

@ -41,7 +41,7 @@ of the leader.
## TTL Values
TTL values can be set to allow DNS results to be cached upstream
TTL values can be set to allow DNS results to be cached downstream
of Consul which can be used to reduce the number of lookups and to amortize
the latency of doing a DNS lookup. By default, all TTLs are zero,
preventing any caching.