[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
       via  2064401 ctdb-docs: Update reference to lmaster/recmaster capability options
      from  44f3bf1 s3: VFS: Remove unused enum value.

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


- Log -----------------------------------------------------------------
commit 20644011ab095a987cdeeaba953992f308175e58
Author: Martin Schwenke <martin at meltin.net>
Date:   Mon Jun 4 15:13:59 2018 +1000

    ctdb-docs: Update reference to lmaster/recmaster capability options
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>
    
    Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
    Autobuild-Date(master): Mon Jun  4 12:37:39 CEST 2018 on sn-devel-144

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

Summary of changes:
 ctdb/doc/ctdb.7.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/doc/ctdb.7.xml b/ctdb/doc/ctdb.7.xml
index 6902e57..a4444c5 100644
--- a/ctdb/doc/ctdb.7.xml
+++ b/ctdb/doc/ctdb.7.xml
@@ -1035,11 +1035,13 @@ correct CIFS semantics to clients.
     </para>
 
     <para>
-	To activate a node as being a remote cluster node you need to set
-	the following two parameters in /etc/sysconfig/ctdb  for the remote node:
+	To activate a node as being a remote cluster node you need to
+	set the following two parameters in
+	/usr/local/etc/ctdb/ctdb.conf for the remote node:
         <screen format="linespecific">
-CTDB_CAPABILITY_LMASTER=no
-CTDB_CAPABILITY_RECMASTER=no
+[legacy]
+  lmaster capability = false
+  recmaster capability = false
 	</screen>
     </para>
 


-- 
Samba Shared Repository