[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  f42d380 s3:brlock: fix a comment typo
      from  164ee00 ctdb-eventscripts: Do not mark node unhealthy if no fs is available

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


- Log -----------------------------------------------------------------
commit f42d380ead3fbb09a9e549005039d20460797c33
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 29 00:55:19 2014 +0100

    s3:brlock: fix a comment typo
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Thu Jan 30 13:25:22 CET 2014 on sn-devel-104

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

Summary of changes:
 source3/locking/brlock.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index c51d66b..c5297dd 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -182,7 +182,7 @@ static bool brl_conflict_posix(const struct lock_struct *lck1,
 		return False;
 	}
 
-	/* Locks on the same context con't conflict. Ignore fnum. */
+	/* Locks on the same context don't conflict. Ignore fnum. */
 	if (brl_same_context(&lck1->context, &lck2->context)) {
 		return False;
 	}


-- 
Samba Shared Repository