[Zodb-checkins] CVS: ZODB3 - MANIFEST:1.9 MANIFEST.in:1.4 NEWS.txt:1.22 README.txt:1.12 ZEO-NEWS.txt:1.43 setup.py:1.23 typeobject.patch:NONE

[Guido van Rossum]

Update of /cvs-repository/ZODB3
In directory cvs.zope.org:/tmp/cvs-serv15487

Modified Files:
	MANIFEST MANIFEST.in NEWS.txt README.txt ZEO-NEWS.txt setup.py 
Removed Files:
	typeobject.patch 
Log Message:
Merge final changes from 3.1 release.  Bump version to 3.1+.


=== ZODB3/MANIFEST 1.8 => 1.9 ===
--- ZODB3/MANIFEST:1.8	Fri Oct  4 20:38:12 2002
+++ ZODB3/MANIFEST	Wed Oct 30 13:57:13 2002
@@ -5,7 +5,6 @@
 ZEO-NEWS.txt
 setup.py
 test.py
-typeobject.patch
 BTrees/BTreeItemsTemplate.c
 BTrees/BTreeModuleTemplate.c
 BTrees/BTreeTemplate.c
@@ -336,7 +335,6 @@
 zdaemon/Daemon.py
 zdaemon/Heartbeat.py
 zdaemon/SignalHandler.py
-zdaemon/SignalPasser.py
 zdaemon/ZDaemonLogging.py
 zdaemon/__init__.py
 zdaemon/tests/__init__.py


=== ZODB3/MANIFEST.in 1.3 => 1.4 ===
--- ZODB3/MANIFEST.in:1.3	Fri Oct  4 20:38:12 2002
+++ ZODB3/MANIFEST.in	Wed Oct 30 13:57:13 2002
@@ -1,5 +1,4 @@
 include MANIFEST
-include typeobject.patch
 include *.txt
 include test.py
 include BTrees/*.c


=== ZODB3/NEWS.txt 1.21 => 1.22 ===
--- ZODB3/NEWS.txt:1.21	Wed Oct 23 15:06:35 2002
+++ ZODB3/NEWS.txt	Wed Oct 30 13:57:13 2002
@@ -1,6 +1,18 @@
+What's new in ZODB3 3.1 final?
+===============================
+Release date: 28-Oct-2002
+
+If an error occurs during conflict resolution, the store will silently
+catch the error, log it, and continue as if the conflict was
+unresolvable.  ZODB used to behave this way, and the change to catch
+only ConflictError was causing problems in deployed systems.  There
+are a lot of legitimate errors that should be caught, but it's too
+close to the final release to make the substantial changes needed to
+correct this.
+
 What's new in ZODB3 3.1 beta 3?
 ===============================
-Release date: 18-Oct-2002
+Release date: 21-Oct-2002
 
 A small extension was made to the iterator protocol.  The Record
 objects, which are returned by the per-transaction iterators, contain
@@ -11,6 +23,10 @@
 provide a stronger statement about consistency than whether the data
 in two records is the same; it's possible for two different updates to
 an object to coincidentally have the same data.
+
+The restore() method was extended to take the data_txn attribute
+mentioned above as an argument.  FileStorage uses the new argument to
+write a backpointer if possible.
 
 A few bugs were fixed.
 


=== ZODB3/README.txt 1.11 => 1.12 ===
--- ZODB3/README.txt:1.11	Wed Oct 23 15:06:35 2002
+++ ZODB3/README.txt	Wed Oct 30 13:57:13 2002
@@ -1,5 +1,5 @@
-ZODB3 3.1 beta 3
-================
+ZODB3 3.1+
+==========
 
 Please see the LICENSE.txt file for terms and conditions.
 


=== ZODB3/ZEO-NEWS.txt 1.42 => 1.43 ===
--- ZODB3/ZEO-NEWS.txt:1.42	Wed Oct 23 15:06:35 2002
+++ ZODB3/ZEO-NEWS.txt	Wed Oct 30 13:57:13 2002
@@ -1,6 +1,10 @@
 Revision History, Zope Enterprise Objects, version 2
 
-  ZEO 2.0 beta 3 (XXX release date here)
+  ZEO 2.0 (2002/10/28)
+
+    There were no changes made after beta 3.
+
+  ZEO 2.0 beta 3 (2002/10/21)
 
     The changes since the ZEO 2.0b2 release are:
 


=== ZODB3/setup.py 1.22 => 1.23 ===
--- ZODB3/setup.py:1.22	Wed Oct 23 15:06:35 2002
+++ ZODB3/setup.py	Wed Oct 30 13:57:13 2002
@@ -176,7 +176,7 @@
 doclines = __doc__.split("\n")
 
 setup(name="ZODB3",
-      version="3.1b3",
+      version="3.1+",
       maintainer="Zope Corporation",
       maintainer_email="zodb-dev@zope.org",
       url = "http://www.zope.org/Wikis/ZODB/FrontPage",

=== Removed File ZODB3/typeobject.patch ===