[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  d878772 doc: Fix documentation for "ctdb timeout" parameter
      from  e0fa422 selftest: Add knownfail entry required to disable tombstone_reanimation

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d87877251a553ac60f314ebe435ec33f46fb6b98
Author: Martin Schwenke <martin at meltin.net>
Date:   Fri Jul 17 19:51:59 2015 +1000

    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 at meltin.net>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Mon Jul 20 15:47:43 CEST 2015 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/smbdotconf/misc/ctdbtimeout.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/misc/ctdbtimeout.xml b/docs-xml/smbdotconf/misc/ctdbtimeout.xml
index 90780d6..1bff098 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>


-- 
Samba Shared Repository