merge from peter
authorAndrew Tridgell <tridge@samba.org>
Thu, 26 Apr 2007 13:28:13 +0000 (15:28 +0200)
committerAndrew Tridgell <tridge@samba.org>
Thu, 26 Apr 2007 13:28:13 +0000 (15:28 +0200)
commitc23d1694db4e19a7349300ed475bf5f7688c522b
tree3ba6fc2460f8267b700f58eb68f4361a22724b86
parent8ae14b4052bc565bee5ff8556121f613155dddd3
parent9d521cf16a601dcce2dea2ba52c33dbeac738150
merge from peter
(This used to be ctdb commit ddf390da2bceb5b3f431433aec424d99d98c05f4)
ctdb/common/ctdb.c
ctdb/common/ctdb_daemon.c
ctdb/ib/ibw_ctdb_init.c
ctdb/include/ctdb_private.h
ctdb/tcp/tcp_init.c