Merge commit 'ctdb-ronnie/master'
authorMichael Adam <obnox@samba.org>
Mon, 23 Mar 2009 09:07:44 +0000 (10:07 +0100)
committerMichael Adam <obnox@samba.org>
Mon, 23 Mar 2009 09:07:44 +0000 (10:07 +0100)
commita83ed1d7430d96fa2648796ac3520d4e3dce01c9
treefc81d1cb6eba8efde744d5242b689f456f305999
parentfd7121371755d5c693ca85ed4581dd9a4b2f0718
parent629d5ee1fa9b84150c25c151b3bf0690cb787a90
Merge commit 'ctdb-ronnie/master'

(This used to be ctdb commit 39a972b0d6d0d70282c25c54a124b67431467e77)
ctdb/config/ctdb.sysconfig
ctdb/include/ctdb_private.h