1. 03 Apr, 2005 2 commits
    • Tim Peters's avatar
      Merge rev 29855 from 3.4 branch. · ef0596a7
      Tim Peters authored
      modifiedInVersion:  remove set_trace() added during ZODB sprint.
      ef0596a7
    • Tim Peters's avatar
      Merge rev 29849 from 3.4 branch. · 6e98228d
      Tim Peters authored
      checkOldStyleRoot:  Can't work in Zope3.
      
      The Persistence module no longer exists in Zope3's idea of what
      ZODB is, but this test relies on it.  Make it tolerate the
      absence of Persistence.
      6e98228d
  2. 01 Apr, 2005 10 commits
  3. 31 Mar, 2005 1 commit
  4. 30 Mar, 2005 2 commits
    • Tim Peters's avatar
      Merge rev 29735 from 3.3 branch. · 16c84148
      Tim Peters authored
      Merge checkin made from a wrong project.
      
      Believe it or not, ZopeUndo is ZEO code, not Zope code.
      
      r29726 | slinkp | 2005-03-30 02:11:22 -0500 (Wed, 30 Mar 2005) | 3 lines
      Changed paths:
         M /Zope/trunk/lib/python/ZopeUndo/Prefix.py
         M /Zope/trunk/lib/python/ZopeUndo/tests/testPrefix.py
      
      Merged slinkp_1726_zopeundo: avoid showing undo transactions in
      the wrong folder.
      16c84148
    • Jim Fulton's avatar
  5. 28 Mar, 2005 3 commits
    • Tim Peters's avatar
      checkTimeoutProvokingConflicts: try to fix rare failures. · 22628b30
      Tim Peters authored
      This always slept for 3 seconds, waiting for the storage to
      disconnect.  This loses on two counts:
      
      1. Since the timeout is set to 1 second, it typically sleeps
         longer than necessary.
      
      2. Since there's no predicting thread and process scheduling,
         3 seconds isn't always long enough, and rare failures have
         been reported against this test.
      
      Instead we do a polling loop now.  This typically succeeds in
      a little more than a second, speeding the normal case.  The
      loop will continue trying for up to a minute if not.
      22628b30
    • Tim Peters's avatar
      Merge rev 29706 from 3.3 branch. · 3065f5bf
      Tim Peters authored
      Change default port # from 9999 to 8100, to match zope.conf
      (well, on Zope trunk anyway -- the ZEO client example appears
      to have gone missing from zope.conf on Zope3 trunk).
      3065f5bf
    • Tim Peters's avatar
      Merge rev 29705 from 3.3 branch. · 3cb64841
      Tim Peters authored
      s/zeo/ZEO/ in logger name, to match other ZEO logger names.
      3cb64841
  6. 24 Mar, 2005 1 commit
    • Tim Peters's avatar
      Merge rev 29668 from 3.3 branch. · 39c41a2b
      Tim Peters authored
      Collector #1734.  Critical bug in BTree conflict resolution.
      
      Stop silent data loss in some BTree cases where a transaction adds
      a new key to a bucket while a concurrent transaction deletes all
      keys from the same bucket.
      
      Still needs porting to 3.2 line.
      39c41a2b
  7. 22 Mar, 2005 2 commits
  8. 21 Mar, 2005 13 commits
  9. 20 Mar, 2005 5 commits
  10. 17 Mar, 2005 1 commit
    • Tim Peters's avatar
      Merge rev 29532 from 3.3 branch. · 98406f05
      Tim Peters authored
      Merge checkin made from a wrong project:
      
      r29511 | gotcha | 2005-03-16 11:01:21 -0500 (Wed, 16 Mar 2005) | 1 line
      Changed paths:
         M /Zope/trunk/utilities/ZODBTools/zodbload.py
      
      port features from 2.7
      98406f05