merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Wed, 16 May 2007 01:12:28 +0000 (11:12 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Wed, 16 May 2007 01:12:28 +0000 (11:12 +1000)
commit4b8ddfccad5800508c2adddffe8634091e0c30c5
treee6418b6ed6eb59a9313936467c7150b30fa3d9d7
parent5d82f89a55fc2a3dd6f813c6d2fd221c1773c34b
parent20d96ad5c5a91e63cc051730cf063743931224c5
merge from tridge

(This used to be ctdb commit 8d424b41d6cf2973b28a749d1b8e6a028dad9ffe)
ctdb/common/ctdb_recoverd.c
ctdb/include/ctdb.h