Rev 189: merge from peter in http://samba.org/~tridge/ctdb

tridge at samba.org tridge at samba.org
Thu Apr 26 13:28:14 GMT 2007


------------------------------------------------------------
revno: 189
revision-id: tridge at samba.org-20070426132813-b2uurlnhovtbdyzg
parent: tridge at samba.org-20070426125141-8ta979wxz91pykyd
parent: psomogyi at gamax.hu-20070426130024-uzynmuecl4plxaen
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Thu 2007-04-26 15:28:13 +0200
message:
  merge from peter
modified:
  common/ctdb.c                  ctdb.c-20061127094323-t50f58d65iaao5of-2
  common/ctdb_daemon.c           ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
  ib/ibw_ctdb_init.c             ibw_ctdb_init.c-20070102171305-cn2z4k7ibx8141d5-1
  ib/ibwrapper.c                 ibwrapper.c-20061204130028-0125b4f5a72f4b11
  ib/ibwrapper_test.c            ibwrapper_test.c-20061214171730-h11a2z5ed6pt66hj-1
  include/ctdb_private.h         ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
  lib/util/debug.c               debug.c-20070417155854-2i3crb0irl716qft-1
  tcp/tcp_init.c                 tcp_init.c-20061128004937-x70q1cu5xzg5g2tm-2
  tests/ctdb_bench.c             ctdb_bench.c-20061219052637-2liagoglohxb6p7s-1
    ------------------------------------------------------------
    revno: 44.1.38
    merged: psomogyi at gamax.hu-20070426130024-uzynmuecl4plxaen
    parent: psomogyi at gamax.hu-20070426123706-7rzcz94rhhsx541m
    parent: tridge at samba.org-20070426125141-8ta979wxz91pykyd
    committer: Peter Somogyi <psomogyi at gamax.hu>
    branch nick: ctdb
    timestamp: Thu 2007-04-26 15:00:24 +0200
    message:
      merged tridge's branch
    ------------------------------------------------------------
    revno: 44.1.37
    merged: psomogyi at gamax.hu-20070426123706-7rzcz94rhhsx541m
    parent: psomogyi at gamax.hu-20070423104514-edodvwcaf6e7hjcc
    committer: Peter Somogyi <psomogyi at gamax.hu>
    branch nick: ctdb
    timestamp: Thu 2007-04-26 14:37:06 +0200
    message:
      made ofed-1.0 (and 1.1) compatible + fixed warnings
    ------------------------------------------------------------
    revno: 44.1.36
    merged: psomogyi at gamax.hu-20070423104514-edodvwcaf6e7hjcc
    parent: psomogyi at gamax.hu-20070420150400-g8f4k05bzrqyacfu
    committer: Peter Somogyi <psomogyi at gamax.hu>
    branch nick: ctdb
    timestamp: Mon 2007-04-23 12:45:14 +0200
    message:
      fixed ctdb/ib bug at reject event
      reverted my suggestion in debug.c (based on my false error detection)
    ------------------------------------------------------------
    revno: 44.1.35
    merged: psomogyi at gamax.hu-20070420150400-g8f4k05bzrqyacfu
    parent: psomogyi at gamax.hu-20070420142257-93mm0wvgwuwm2uje
    committer: Peter Somogyi <psomogyi at gamax.hu>
    branch nick: ctdb
    timestamp: Fri 2007-04-20 17:04:00 +0200
    message:
      use talloc_vasprintf
    ------------------------------------------------------------
    revno: 44.1.34
    merged: psomogyi at gamax.hu-20070420142257-93mm0wvgwuwm2uje
    parent: psomogyi at gamax.hu-20070420125010-isy99dkf2knmr1ea
    committer: Peter Somogyi <psomogyi at gamax.hu>
    branch nick: ctdb
    timestamp: Fri 2007-04-20 16:22:57 +0200
    message:
      removing my dirt from tridge's code
      (this change wasn't necessary)
    ------------------------------------------------------------
    revno: 44.1.33
    merged: psomogyi at gamax.hu-20070420125010-isy99dkf2knmr1ea
    parent: psomogyi at gamax.hu-20070420124752-n559f9hado9soe3j
    parent: tridge at samba.org-20070419215034-109370d61422c5cb
    committer: Peter Somogyi <psomogyi at gamax.hu>
    branch nick: ctdb
    timestamp: Fri 2007-04-20 14:50:10 +0200
    message:
      merged tridge's branch
    ------------------------------------------------------------
    revno: 44.1.32
    merged: psomogyi at gamax.hu-20070420124752-n559f9hado9soe3j
    parent: psomogyi at gamax.hu-20070420122619-weydn884olayo0w6
    committer: Peter Somogyi <psomogyi at gamax.hu>
    branch nick: ctdb
    timestamp: Fri 2007-04-20 14:47:52 +0200
    message:
      Simplified code in ctdb_init_transport.
    ------------------------------------------------------------
    revno: 44.1.31
    merged: psomogyi at gamax.hu-20070420122619-weydn884olayo0w6
    parent: psomogyi at gamax.hu-20070419135208-yt33cm3sci5b6ofx
    committer: Peter Somogyi <psomogyi at gamax.hu>
    branch nick: ctdb
    timestamp: Fri 2007-04-20 14:26:19 +0200
    message:
      - ctdb/ib minor bugfixes (error case)
      - make ctdb capable of alternative connection (like ib) again, solved the fork problem
      - do_debug memory overwrite bugfix (occured using ibwrapper_test with wrong address given)
    ------------------------------------------------------------
    revno: 44.1.30
    merged: psomogyi at gamax.hu-20070419135208-yt33cm3sci5b6ofx
    parent: psomogyi at gamax.hu-20070416142829-iglfqwwgka38risg
    parent: tridge at samba.org-20070419083149-bc28d74eb9e5df7b
    committer: Peter Somogyi <psomogyi at gamax.hu>
    branch nick: ctdb
    timestamp: Thu 2007-04-19 15:52:08 +0200
    message:
      Merged tridge's ctdb branch.
    ------------------------------------------------------------
    revno: 44.1.29
    merged: psomogyi at gamax.hu-20070416142829-iglfqwwgka38risg
    parent: psomogyi at gamax.hu-20070329164602-mvke1cynxguwrpyu
    parent: tridge at samba.org-20070416130336-89ba103e570a8324
    committer: Peter Somogyi <psomogyi at gamax.hu>
    branch nick: ctdb
    timestamp: Mon 2007-04-16 16:28:29 +0200
    message:
      merged tridge's branch 
    ------------------------------------------------------------
    revno: 44.1.28
    merged: psomogyi at gamax.hu-20070329164602-mvke1cynxguwrpyu
    parent: psomogyi at gamax.hu-20070226105920-dlootykwymain6s1
    committer: Peter Somogyi <psomogyi at gamax.hu>
    branch nick: ctdb
    timestamp: Thu 2007-03-29 18:46:02 +0200
    message:
      ib: test scenario was wrong
      it sent message in both (or all) direction at the same time. Now it measures normal pingpong.

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


More information about the samba-cvs mailing list