merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Mon, 10 Sep 2007 03:21:11 +0000 (13:21 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 10 Sep 2007 03:21:11 +0000 (13:21 +1000)
commit1f21d4d563232926c35d03c4d69eb69190823dc6
tree87473dadb95644142b5b2a0b86992accc63450dc
parentb1b59f3294ee7a5ed6d685f373bf19d3152170fa
parente7d3ef4443686529299e8f293398cc0522235627
merge from ronnie
server/ctdb_takeover.c