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

[Casey Duncan]

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

Modified Files:
      Tag: Zope-2_7-branch
	CHANGES.txt 
Log Message:
Fix KeyError in mergeResults() when merging results sorted using a small index. 
Add mergeResults unit tests.


=== Zope/doc/CHANGES.txt 1.625.2.156 => 1.625.2.157 ===
--- Zope/doc/CHANGES.txt:1.625.2.156	Mon May 17 13:31:30 2004
+++ Zope/doc/CHANGES.txt	Tue May 18 10:48:47 2004
@@ -105,6 +105,9 @@
 
        
     Bugs Fixed
+    
+     - Fixed bug in catalog merging which could cause a KeyError when
+       merging results sorted by an index with few keys.
 
      - Collector #1126: ZPublisher.Converters.field2lines now using 
        splitlines() instead of split('\n').