diff options
| author | Martin Schwenke <martin@meltin.net> | 2015-07-17 19:51:59 +1000 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2015-07-20 15:47:43 +0200 |
| commit | d87877251a553ac60f314ebe435ec33f46fb6b98 (patch) | |
| tree | 2ac01a1e769f13279c689f9e8456d9aeaafa394e /docs-xml/smbdotconf | |
| parent | e0fa42201b5ff1b2d67f1c3cdb0d3dbcce9b6e40 (diff) | |
| download | samba-d87877251a553ac60f314ebe435ec33f46fb6b98.tar.gz | |
doc: Fix documentation for "ctdb timeout" parameter
The documentation claims this is specified in seconds. However, it is
passed straight through to poll(2), which takes a timeout in
milliseconds.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Mon Jul 20 15:47:43 CEST 2015 on sn-devel-104
Diffstat (limited to 'docs-xml/smbdotconf')
| -rw-r--r-- | docs-xml/smbdotconf/misc/ctdbtimeout.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs-xml/smbdotconf/misc/ctdbtimeout.xml b/docs-xml/smbdotconf/misc/ctdbtimeout.xml index 90780d6e997..1bff09809c0 100644 --- a/docs-xml/smbdotconf/misc/ctdbtimeout.xml +++ b/docs-xml/smbdotconf/misc/ctdbtimeout.xml @@ -3,7 +3,7 @@ type="integer" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> - <para>This parameter specifies a timeout in seconds for the + <para>This parameter specifies a timeout in milliseconds for the connection between Samba and ctdb. It is only valid if you have compiled Samba with clustering and if you have set <parameter>clustering=yes</parameter>. @@ -27,7 +27,7 @@ access the registry contact to ctdb is required. </para> <para>Setting <parameter>ctdb timeout</parameter> to n makes - any process waiting longer than n seconds for a reply by the + any process waiting longer than n milliseconds for a reply by the cluster panic. Setting it to 0 (the default) makes Samba block forever, which is the highly recommended default. </para> |