[Zope-Checkins] CVS: Zope/doc - CHANGES.txt:1.535.2.141

[Florent Guillaume]

Update of /cvs-repository/Zope/doc
In directory cvs.zope.org:/tmp/cvs-serv18988/doc

Modified Files:
      Tag: Zope-2_6-branch
	CHANGES.txt 
Log Message:
Merge from HEAD:
ConflictError was swallowed in ObjectManager by manage_beforeDelete and
_delObject. This could break code expecting to do cleanups before
deletion.


=== Zope/doc/CHANGES.txt 1.535.2.140 => 1.535.2.141 ===
--- Zope/doc/CHANGES.txt:1.535.2.140	Tue Oct 14 05:04:48 2003
+++ Zope/doc/CHANGES.txt	Sun Nov  2 13:14:43 2003
@@ -8,6 +8,10 @@
 
     Bugs Fixed
 
+     - ConflictError was swallowed in ObjectManager by
+       manage_beforeDelete and _delObject. This could break code
+       expecting to do cleanups before deletion.
+
      - Collector #1079: Fixed BaseRequest's traversal loop to avoid some
        infinite loop scenarios.