[Zodb-checkins] CVS: Packages/ZEO - CHANGES.txt:1.20

[Jim Fulton]

Update of /cvs-repository/Packages/ZEO
In directory korak:/tmp/cvs-serv14131

Modified Files:
	CHANGES.txt 
Log Message:
*** empty log message ***


--- Updated File CHANGES.txt in package Packages/ZEO --
--- CHANGES.txt	2001/03/27 23:35:34	1.19
+++ CHANGES.txt	2001/04/02 21:39:27	1.20
@@ -37,6 +37,10 @@
 
     Bugs Fixed
 
+      - Application-level conflict resolution, introduced in Zope
+        2.3.1, was not supported. This caused the ZEO cache to be
+        written incorrectly.
+
       - A possible (but unobserved) race condition that could
         lead to ZEO cache corruption was corrected.