merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Mon, 4 Jun 2007 10:10:53 +0000 (20:10 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Mon, 4 Jun 2007 10:10:53 +0000 (20:10 +1000)
commit1ee8989bd486d4b9701b6218f6e794008653754d
treeb2601639392765fcfd5a873dd8668896f921b40f
parent79b54a624e320a4eb0c20d910b6107ba3cbea393
parentfcce534f23393b9319ad70df09450baa39affd61
merge from tridge

(This used to be ctdb commit 3bfede5d46dba5a3654dad9205534391bc339461)
ctdb/common/ctdb_client.c
ctdb/common/ctdb_control.c
ctdb/config/ctdb.sysconfig
ctdb/include/ctdb_private.h
ctdb/tools/ctdb_control.c