samba-cvs.cvs
[Top] [All Lists]

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

Subject: Rev 162: merge from ronnie in http://samba.org/~tridge/ctdb
From:
Date: Thu, 19 Apr 2007 12:43:19 +1000
------------------------------------------------------------
revno: 162
revision-id: tridge@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
parent: tridge@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
parent: ronniesahlberg@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
committer: Andrew Tridgell <tridge@xxxxxxxxx>
branch nick: tridge
timestamp: Thu 2007-04-19 12:43:19 +1000
message:
  merge from ronnie
  remove unused bench_incr function in ctdb_bench.c
modified:
  common/ctdb_daemon.c           ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
  direct/ctdbd.sh                ctdbd.sh-20070411085038-phusiewluwzyqjpc-2
  direct/ctdbd_test.c            ctdbd_test.c-20070411085057-17kgjzfktsh28g99-1
  tests/ctdb_bench.c             ctdb_bench.c-20061219052637-2liagoglohxb6p7s-1
    ------------------------------------------------------------
    merged: ronniesahlberg@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    parent: ronniesahlberg@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    committer: Ronnie sahlberg <ronniesahlberg@xxxxxxxxx>
    branch nick: ctdb
    timestamp: Thu 2007-04-19 12:34:39 +1000
    message:
      remove a comment that is no longer valid
    ------------------------------------------------------------
    merged: ronniesahlberg@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    parent: ronniesahlberg@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    committer: Ronnie sahlberg <ronniesahlberg@xxxxxxxxx>
    branch nick: ctdb
    timestamp: Thu 2007-04-19 12:33:13 +1000
    message:
      add some tests in the daemon that a REQ_CALL that a client sent us has 
valid srcnode and destnode
      
      update ctdbd_test.c to show how to force a migration onto the local node
    ------------------------------------------------------------
    merged: ronniesahlberg@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    parent: ronniesahlberg@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    parent: tridge@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    committer: Ronnie sahlberg <ronniesahlberg@xxxxxxxxx>
    branch nick: ctdb
    timestamp: Thu 2007-04-19 12:00:29 +1000
    message:
      merge from tridge
    ------------------------------------------------------------
    merged: ronniesahlberg@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    parent: ronniesahlberg@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    parent: tridge@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    committer: Ronnie sahlberg <ronniesahlberg@xxxxxxxxx>
    branch nick: ctdb
    timestamp: Thu 2007-04-19 11:58:34 +1000
    message:
      merge from tridge
    ------------------------------------------------------------
    merged: ronniesahlberg@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    parent: ronniesahlberg@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    committer: Ronnie sahlberg <ronniesahlberg@xxxxxxxxx>
    branch nick: ctdb
    timestamp: Thu 2007-04-19 10:24:11 +1000
    message:
      ctdbd does no longer take a --daemon parameter since we no longer do 
non-daemon mode
      remove the parameter from the ctdbd script
      
      remove the store_unlock from ctdbd_test since there is no and will be no 
pdu for this
      CTDB_REPLY_FETCH_LOCK no longer return the data for the record since the 
client is assumed to read this itself from the local tdb. remove some variables 
that no longer exists.
    ------------------------------------------------------------
    merged: ronniesahlberg@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    parent: ronniesahlberg@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    parent: tridge@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    committer: Ronnie sahlberg <ronniesahlberg@xxxxxxxxx>
    branch nick: ctdb
    timestamp: Thu 2007-04-19 10:07:07 +1000
    message:
      merge from tridge
    ------------------------------------------------------------
    merged: ronniesahlberg@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    parent: ronniesahlberg@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    parent: tridge@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    committer: Ronnie sahlberg <ronniesahlberg@xxxxxxxxx>
    branch nick: ctdb
    timestamp: Thu 2007-04-19 08:18:38 +1000
    message:
      merge from tridge

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

<Prev in Thread] Current Thread [Next in Thread>
  • Rev 162: merge from ronnie in http://samba.org/~tridge/ctdb, tridge <=