merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Mon, 4 Feb 2008 09:07:15 +0000 (20:07 +1100)
committerAndrew Tridgell <tridge@samba.org>
Mon, 4 Feb 2008 09:07:15 +0000 (20:07 +1100)
commitf6e53f433bf8e184ffc281f14c4eacda1ffc935c
tree577c389c61b4a0d7b51fbf0a0294cbd84bc79f48
parent9d6ac0cf559535e8ac7082125692afd287b353e5
merge from ronnie

(This used to be ctdb commit e7b57d38cf7255be823a223cf15b7526285b4f1c)
36 files changed:
ctdb/client/ctdb_client.c
ctdb/common/cmdline.c
ctdb/common/ctdb_io.c
ctdb/common/ctdb_ltdb.c
ctdb/common/ctdb_util.c
ctdb/common/rb_tree.c
ctdb/common/system_aix.c
ctdb/common/system_linux.c
ctdb/ib/ibw_ctdb.c
ctdb/ib/ibw_ctdb_init.c
ctdb/ib/ibwrapper.c
ctdb/ib/ibwrapper_test.c
ctdb/server/ctdb_call.c
ctdb/server/ctdb_control.c
ctdb/server/ctdb_daemon.c
ctdb/server/ctdb_freeze.c
ctdb/server/ctdb_keepalive.c
ctdb/server/ctdb_logging.c
ctdb/server/ctdb_ltdb_server.c
ctdb/server/ctdb_monitor.c
ctdb/server/ctdb_persistent.c
ctdb/server/ctdb_recover.c
ctdb/server/ctdb_recoverd.c
ctdb/server/ctdb_server.c
ctdb/server/ctdb_serverids.c
ctdb/server/ctdb_takeover.c
ctdb/server/ctdb_traverse.c
ctdb/server/ctdb_tunables.c
ctdb/server/ctdbd.c
ctdb/server/eventscript.c
ctdb/tcp/tcp_connect.c
ctdb/tcp/tcp_init.c
ctdb/tcp/tcp_io.c
ctdb/tests/ctdb_persistent.c
ctdb/tools/ctdb.c
ctdb/tools/ctdb_vacuum.c