summaryrefslogtreecommitdiff
path: root/doc/manpages
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-12 19:48:45 +0000
committerGerrit Code Review <review@openstack.org>2017-06-12 19:48:45 +0000
commit7bbe02b290e534074a179fed23a86b0b90dd1ae7 (patch)
tree0f26098f223a2560d7ed35dfefedc810bf7371a4 /doc/manpages
parent53b356b1ee40c8967a35138c122615f2fd84c5ce (diff)
parent420e73fabd87ae54f8892b5343e5ff99498e6520 (diff)
downloadswift-7bbe02b290e534074a179fed23a86b0b90dd1ae7.tar.gz
Merge "Allow to configure the nameservers in cname_lookup"
Diffstat (limited to 'doc/manpages')
-rw-r--r--doc/manpages/proxy-server.conf.54
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/manpages/proxy-server.conf.5 b/doc/manpages/proxy-server.conf.5
index 4f4ac8be7..5e1395026 100644
--- a/doc/manpages/proxy-server.conf.5
+++ b/doc/manpages/proxy-server.conf.5
@@ -564,6 +564,10 @@ The domain to be used by the middleware.
.IP \fBlookup_depth\fR
How deep in the CNAME chain to look for something that matches the storage domain.
The default is 1.
+.IP \fBnameservers\fR
+Specify the nameservers to use to do the CNAME resolution. If unset, the system
+configuration is used. Multiple nameservers can be specified separated by a comma.
+Default is unset.
.RE
.PD