From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Fri, 4 May 2007 15:22:30 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2780^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1725fcf2947d3832c4b3911b1f90fa596e1b5f78;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 62574808ef4dcb76760f1dd2496fbe8e34197c23)
---

1725fcf2947d3832c4b3911b1f90fa596e1b5f78
diff --cc ctdb/include/ctdb_private.h
index 411496a03be,4ef93123445..a9bef8852e7
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@@ -282,7 -285,9 +285,10 @@@ enum ctdb_controls {CTDB_CONTROL_PROCES
  		    CTDB_CONTROL_TRAVERSE_DATA,
  		    CTDB_CONTROL_REGISTER_SRVID,
  		    CTDB_CONTROL_DEREGISTER_SRVID,
 +		    CTDB_CONTROL_GET_DBNAME,
+ 		    CTDB_CONTROL_ENABLE_SEQNUM,
+ 		    CTDB_CONTROL_UPDATE_SEQNUM,
+ 		    CTDB_CONTROL_SET_SEQNUM_FREQUENCY,
  };