merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Sun, 2 Dec 2007 23:19:24 +0000 (10:19 +1100)
committerAndrew Tridgell <tridge@samba.org>
Sun, 2 Dec 2007 23:19:24 +0000 (10:19 +1100)
commit6653a0b67381310236e548e5fc0a9e27209b44e0
tree15eb644cad6bc72cbd21775e931317bee4556ed2
parent1178fcce1a701441d43d4ed959f0ba6b50a5b07d
parent5043a0afeedbd30c7f64c2733c8ae5bf75479a98
merge from ronnie
server/ctdb_monitor.c
server/ctdb_recover.c
server/ctdb_recoverd.c
server/ctdb_takeover.c