X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=CHANGELOG;h=48c0ab15dab05ec3578a3f88a6391793589cfc74;hb=edf09fc5529eae3e8214a432058b4c07b2b8d2f9;hp=1efb1b8af05a4c50a5cb834de83bd4aaab1e2d48;hpb=b65a198dd944f9e3f4bd6d660d4a7f5d260a60bc;p=idzebra-moved-to-github.git

diff --git a/CHANGELOG b/CHANGELOG
index 1efb1b8..48c0ab1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,23 @@
-<<<<<<< CHANGELOG
-Reduced disk space for saved keys (storeKeys = 1).
+Bug fix: The show records facility (-s) only displayed information for
+the first record in a file (and not for every record in the file).
+
+Added option "-f <n>" to limit the logging of record operations. After
+<n> records has been processed no logging is performed (unless errors
+occur).
+
+Bug fix: the compressed ISAM system didn't handle update operations
+correctly.
+
+Added setting, "maxResultSetSize", to hold the number of records to 
+save in a result set.
+
+Bug fix: Complete phrase did't work for search operations.
 
-Added optional, physical ANY (key replication)
-=======
 Bug fix: temporary result sets weren't deleted.
 
 Reduced disk space for saved keys (storeKeys = 1).
->>>>>>> 1.30
+
+Added optional, physical ANY (key replication)
 
 Implemented proximity operator in search.