[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - be7a16a43a458bb3033bbd2256882ca17a11c6a1

Michael Adam obnox at samba.org
Tue Oct 27 02:28:21 MDT 2009


The branch, v3-4-ctdb has been updated
       via  be7a16a43a458bb3033bbd2256882ca17a11c6a1 (commit)
       via  10596be88db644fb6769d30f1560b9852c0565b2 (commit)
      from  9442e256ce46ab4c80883a7a2fb793d4ea1f7010 (commit)

http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb


- Log -----------------------------------------------------------------
commit be7a16a43a458bb3033bbd2256882ca17a11c6a1
Author: Michael Adam <obnox at samba.org>
Date:   Tue Oct 27 09:25:49 2009 +0100

    dbwrap_ctdb: revert code accidentially committed in the vendor patch bump 8->9
    
    Michael

commit 10596be88db644fb6769d30f1560b9852c0565b2
Author: Michael Adam <obnox at samba.org>
Date:   Tue Oct 27 09:26:44 2009 +0100

    v3-4-ctdb: Bump the ctdb verdor patch level to 10 (for the NEXT release =)
    
    Michael

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

Summary of changes:
 source3/VERSION           |    2 +-
 source3/lib/dbwrap_ctdb.c |    6 ------
 2 files changed, 1 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/VERSION b/source3/VERSION
index 96f9b2e..3b67f88 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -85,7 +85,7 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=no
 #                                                      #
 ########################################################
 SAMBA_VERSION_VENDOR_SUFFIX="ctdb"
-SAMBA_VERSION_VENDOR_PATCH=9
+SAMBA_VERSION_VENDOR_PATCH=10
 
 ########################################################
 # This can be set by vendors if they want..            #
diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index 8337877..f492d5f 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -23,10 +23,6 @@
 #include "ctdb_private.h"
 #include "ctdbd_conn.h"
 
-struct db_ctdb_transaction_record {
-	TDB_DATA key, data;
-};
-
 struct db_ctdb_transaction_handle {
 	struct db_ctdb_ctx *ctx;
 	bool in_replay;
@@ -37,8 +33,6 @@ struct db_ctdb_transaction_handle {
 	struct ctdb_marshall_buffer *m_write;
 	uint32_t nesting;
 	bool nested_cancel;
-
-	struct db_ctdb_transaction_record *transaction_records;
 };
 
 struct db_ctdb_ctx {


-- 
SAMBA-CTDB repository


More information about the samba-cvs mailing list