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

tridge at samba.org tridge at samba.org
Wed Jul 4 04:51:34 GMT 2007


------------------------------------------------------------
revno: 554
revision-id: tridge at samba.org-20070704045133-umv584idgrsbj03e
parent: tridge at samba.org-20070704031445-m5fab6yl49w9f2hv
parent: sahlberg at ronnie-20070704041628-k3och7ffjambzc8q
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Wed 2007-07-04 14:51:33 +1000
message:
  merge from ronnie
removed:
  tools/socketkiller.c           socketkiller.c-20070704025142-tipbngbwruk1brmb-1
modified:
  Makefile.in                    makefile.in-20061117234101-o3qt14umlg9en8z0-1
  include/ctdb_private.h         ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
  takeover/ctdb_takeover.c       ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2
  takeover/system.c              system.c-20070525071636-a5n1ihghjtppy08r-3
  tools/ctdb.c                   ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1
    ------------------------------------------------------------
    revno: 432.1.100
    merged: sahlberg at ronnie-20070704041628-k3och7ffjambzc8q
    parent: sahlberg at ronnie-20070704041448-zf42ebj413oy5jxk
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Wed 2007-07-04 14:16:28 +1000
    message:
      we dont need socketkiller anymore now that the 
      kill-tcp-connection code is available from the ctdb tool
    ------------------------------------------------------------
    revno: 432.1.99
    merged: sahlberg at ronnie-20070704041448-zf42ebj413oy5jxk
    parent: sahlberg at ronnie-20070704035322-513o090px81lwtz7
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Wed 2007-07-04 14:14:48 +1000
    message:
      add a killtcp command to the ctdb tool
    ------------------------------------------------------------
    revno: 432.1.98
    merged: sahlberg at ronnie-20070704035322-513o090px81lwtz7
    parent: sahlberg at ronnie-20070704033238-gs7rwc6rlho71alx
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Wed 2007-07-04 13:53:22 +1000
    message:
      add a new  ctdb_sys_kill_tcp() function that kills (RST) the specified 
      connection
    ------------------------------------------------------------
    revno: 432.1.97
    merged: sahlberg at ronnie-20070704033238-gs7rwc6rlho71alx
    parent: sahlberg at ronnie-20070704032708-ecwyhewxyednnep5
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Wed 2007-07-04 13:32:38 +1000
    message:
      change the signature for ctdb_sys_send_ack() to ctdb_sys_send_tcp()
      to make it possible to provide which seq/ack numbers to use and also 
      whether the RST flag should be set.
      
      update all callers to the new signature
    ------------------------------------------------------------
    revno: 432.1.96
    merged: sahlberg at ronnie-20070704032708-ecwyhewxyednnep5
    parent: sahlberg at ronnie-20070704031354-81v3w54n4nbel5p3
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Wed 2007-07-04 13:27:08 +1000
    message:
      ETH_P_IP does not work on my ubuntu system   so changing it back to the 
      slightly less efficient ETH_P_ALL
    ------------------------------------------------------------
    revno: 432.1.95
    merged: sahlberg at ronnie-20070704031354-81v3w54n4nbel5p3
    parent: sahlberg at ronnie-20070704025207-o9ddwpxme8vji4mz
    parent: tridge at samba.org-20070704031445-m5fab6yl49w9f2hv
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Wed 2007-07-04 13:13:54 +1000
    message:
      merge from tridge

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


More information about the samba-cvs mailing list