[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  cbe9fed Spelling correction: exlusive -> exclusive and semantincs -> semantics
       via  ac0e575 Spelling correction: exlusive -> exclusive
      from  acb8182 s3:wscript_build: fix the build using dmapi and fam together

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


- Log -----------------------------------------------------------------
commit cbe9fed248a85e3ab57df63656204941925f8131
Author: Paul Wayper <paulway at redhat.com>
Date:   Wed Jul 8 12:37:31 2015 +1000

    Spelling correction: exlusive -> exclusive and semantincs -> semantics
    
    Signed-off-by: Paul Wayper <paulway at redhat.com>
    Reviewed-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): Wed Jul  8 15:54:15 CEST 2015 on sn-devel-104

commit ac0e575b954bfa8bb5253bb4a515b3950cf3842f
Author: Paul Wayper <paulway at redhat.com>
Date:   Wed Jul 8 12:34:25 2015 +1000

    Spelling correction: exlusive -> exclusive
    
    Signed-off-by: Paul Wayper <paulway at redhat.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 ctdb/doc/readonlyrecords.txt | 2 +-
 source3/smbd/oplock.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/doc/readonlyrecords.txt b/ctdb/doc/readonlyrecords.txt
index d108ffd..5374a85 100644
--- a/ctdb/doc/readonlyrecords.txt
+++ b/ctdb/doc/readonlyrecords.txt
@@ -12,7 +12,7 @@ rapidly bounce between nodes and acts as a scalability limitation.
 This primarily affects locking.tdb and brlock.tdb, two databases where record access is 
 read-mostly and where writes are semi-rare.
 
-For the common case, if CTDB provided shared non-exlusive Read-Only lock semantincs
+For the common case, if CTDB provided shared non-exclusive Read-Only lock semantics
 this would greatly improve scaling for these workloads.
 
 
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 2d426f7..4d84347 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -1211,7 +1211,7 @@ static void do_break_to_none(struct tevent_context *ctx,
 		/* Paranoia .... */
 		if (EXCLUSIVE_OPLOCK_TYPE(e->op_type)) {
 			DEBUG(0,("%s: PANIC. "
-				 "share mode entry %d is an exlusive "
+				 "share mode entry %d is an exclusive "
 				 "oplock !\n", __func__, i ));
 			TALLOC_FREE(lck);
 			abort();


-- 
Samba Shared Repository