[SCM] CTDB repository - branch master updated - ctdb-1.13-151-g2a3d224

[Ronnie Sahlberg]

The branch, master has been updated
       via  2a3d22431948f849c93762a6ab49344acb687feb (commit)
       via  6a92fc2b8da2bba98dca29b781ab459ba4e879a5 (commit)
       via  c642b452e7b0272e32c02509ac579b790d9a03e7 (commit)
      from  05603e914f8c12618d7e06943c0f7df207f645b0 (commit)

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


- Log -----------------------------------------------------------------
commit 2a3d22431948f849c93762a6ab49344acb687feb
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Tue May 1 12:09:48 2012 +1000

    Revert "server: locking: Provide a common API for non-blocking locking of TDBs"
    
    This reverts commit 6a92fc2b8da2bba98dca29b781ab459ba4e879a5.
    
    Reverting incomplete changes to ctdb_lock.c

commit 6a92fc2b8da2bba98dca29b781ab459ba4e879a5
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Thu Apr 26 15:48:12 2012 +1000

    server: locking: Provide a common API for non-blocking locking of TDBs

commit c642b452e7b0272e32c02509ac579b790d9a03e7
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Mon Apr 23 15:53:29 2012 +1000

    tests/simple: Fix typo in the test message
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>

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

Summary of changes:
 tests/simple/75_readonly_records_basic.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/tests/simple/75_readonly_records_basic.sh b/tests/simple/75_readonly_records_basic.sh
index db5b792..f243ea1 100755
--- a/tests/simple/75_readonly_records_basic.sh
+++ b/tests/simple/75_readonly_records_basic.sh
@@ -71,7 +71,7 @@ try_command_on_node -q 0,1,2 $CTDB_TEST_WRAPPER "ctdb_fetch_readonly_once </dev/
 # no delegations should have been created
 numreadonly=`try_command_on_node -v all $CTDB_TEST_WRAPPER ctdb cattdb test.tdb | grep READONLY | wc -l`
 [ "$numreadonly" != "0" ] && {
-    echo "BAD: readonly delegations were created byt the feature is not activated on the database"
+    echo "BAD: readonly delegations were created, but the feature is not activated on the database"
     exit 1
 }
 


-- 
CTDB repository