[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  8dede57 ctdb: Fix a comment typo
      from  042f94b torture3: Add a test deleting a different req

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


- Log -----------------------------------------------------------------
commit 8dede57741f4c77c8909b3b44b2668bcec9f6975
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Feb 7 14:11:19 2014 +0100

    ctdb: Fix a comment typo
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Apr 30 21:05:09 CEST 2014 on sn-devel-104

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

Summary of changes:
 ctdb/server/ctdb_lock.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/server/ctdb_lock.c b/ctdb/server/ctdb_lock.c
index 339a9d2..90f74e4 100644
--- a/ctdb/server/ctdb_lock.c
+++ b/ctdb/server/ctdb_lock.c
@@ -242,7 +242,7 @@ static int db_lock_unmark_handler(struct ctdb_db_context *ctdb_db, uint32_t prio
 int ctdb_lockall_unmark_prio(struct ctdb_context *ctdb, uint32_t priority)
 {
 	/*
-	 * This function is only used by the main dameon during recovery.
+	 * This function is only used by the main daemon during recovery.
 	 * At this stage, the databases have already been locked, by a
 	 * dedicated child process. The freeze_mode variable is used to track
 	 * whether the actual locks are held by the child process or not.


-- 
Samba Shared Repository