[Checkins] SVN: Products.ZCatalog/trunk/CHANGES.txt Fix bad merge of changelog

Hanno Schlichting hannosch at hannosch.eu
Thu Apr 21 14:08:13 EDT 2011


Log message for revision 121455:
  Fix bad merge of changelog
  

Changed:
  U   Products.ZCatalog/trunk/CHANGES.txt

-=-
Modified: Products.ZCatalog/trunk/CHANGES.txt
===================================================================
--- Products.ZCatalog/trunk/CHANGES.txt	2011-04-21 18:07:09 UTC (rev 121454)
+++ Products.ZCatalog/trunk/CHANGES.txt	2011-04-21 18:08:13 UTC (rev 121455)
@@ -4,6 +4,11 @@
 2.13.10 (unreleased)
 --------------------
 
+- Handle `TypeErrors` in the KeywordIndex if an indexed attribute is a method
+  with required arguments.
+
+- Protect against implicitly acquiring attributes for indexes.
+
 - Added reporting of the intersection time of each index' result with the
   result set of the other indexes and consider this time to be part of each
   index time for prioritizing the index.
@@ -14,11 +19,6 @@
 2.13.9 (2011-04-10)
 -------------------
 
-- Handle `TypeErrors` in the KeywordIndex if an indexed attribute is a method
-  with required arguments.
-
-- Protect against implicitly acquiring attributes for indexes.
-
 - Added a floor and ceiling value to the date range index. Values outside the
   specified range will be interpreted the same way as passing `None`, i.e.
   `since the beginning of time` and `until the end of it`. This allows the



More information about the checkins mailing list