Rev 332: merge from ronnie in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 332
revision-id: tridge at samba.org-20070523045041-a6v1tls6f3m01bqx
parent: tridge at samba.org-20070523043519-e3eiktftt5q3f62e
parent: sahlberg at ronnie-20070520232434-xxhlg6zdpx5kkvjp
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Wed 2007-05-23 14:50:41 +1000
message:
  merge from ronnie
modified:
  common/ctdb.c                  ctdb.c-20061127094323-t50f58d65iaao5of-2
  common/ctdb_client.c           ctdb_client.c-20070411010216-3kd8v37k61steeya-1
  common/ctdb_control.c          ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1
  common/ctdb_monitor.c          ctdb_monitor.c-20070518100625-8jf4ft1mjzmb22ck-1
  include/ctdb.h                 ctdb.h-20061117234101-o3qt14umlg9en8z0-11
  include/ctdb_private.h         ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
  tools/ctdb_control.c           ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1
    ------------------------------------------------------------
    revno: 326.1.3
    merged: sahlberg at ronnie-20070520232434-xxhlg6zdpx5kkvjp
    parent: sahlberg at ronnie-20070519221839-a9mpdvipiatk5nag
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Mon 2007-05-21 09:24:34 +1000
    message:
      add controls to enable/disable the monitoring of dead nodes
    ------------------------------------------------------------
    revno: 326.1.2
    merged: sahlberg at ronnie-20070519221839-a9mpdvipiatk5nag
    parent: sahlberg at ronnie-20070519065910-liyyxru2wl1eah69
    parent: tridge at samba.org-20070519111106-hmbognp9baltnxgw
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Sun 2007-05-20 08:18:39 +1000
    message:
      merge from tridge

Diff too large for email (238, the limit is 200).