Merge branch 'v0.9.x'

Conflicts:
	CHANGES

CHANGES

@@ -9,7 +9,7 @@ Change History
 - NEO learned to store empty values (although it's useless when managed by
   a ZODB Connection).
 
-0.9.2 (unreleased)
+0.9.2 (2011-10-17)
 ------------------
 
 - storage: a specific socket can be given to MySQL backend

README

@@ -143,20 +143,17 @@ NEO has no built-in deployment features such as process daemonization. We use
   [group:neo]
   programs=master_01,storage_01,admin
 
-  [program:master_01]
-  priority=1
-  command=neomaster -c neo -s master_01 -f /neo/neo.conf
-  user=neo
-
   [program:storage_01]
-  priority=2
+  priority=10
   command=neostorage -c neo -s storage_01 -f /neo/neo.conf
-  user=neo
+
+  [program:master_01]
+  priority=20
+  command=neomaster -c neo -s master_01 -f /neo/neo.conf
 
   [program:admin]
-  priority=3
+  priority=20
   command=neoadmin -c neo -s admin -f /neo/neo.conf
-  user=neo
 
 Developers
 ==========

neo/client/__init__.py

@@ -12,14 +12,18 @@
 #
 ##############################################################################
 
-# NEO requires ZODB to allow TID to be returned as late as tpc_finish.
-# At the moment, no ZODB release include this patch.
+# At the moment, no ZODB release include the following patches.
 # Later, this must be replaced by some detection mechanism.
-needs_patch = True
+if 1:
 
-if needs_patch:
     from ZODB.Connection import Connection
 
+    # Allow serial to be returned as late as tpc_finish
+    #
+    # This makes possible for storage to allocate serial inside tpc_finish,
+    # removing the requirement to serialise second commit phase (tpc_vote
+    # to tpc_finish/tpc_abort).
+
     def tpc_finish(self, transaction):
         """Indicate confirmation that the transaction is done."""
 
@@ -50,6 +54,8 @@ if needs_patch:
 
     Connection.tpc_finish = tpc_finish
 
+    ###
+
     try:
         if Connection._nexedi_fix != 4:
             raise Exception("A different ZODB fix is already applied")

setup.py

@@ -36,7 +36,7 @@ extras_require['tests'] = ['zope.testing', 'psutil',
 
 setup(
     name = 'neoppod',
-    version = '0.9.1',
+    version = '0.9.2',
     description = __doc__.strip(),
     author = 'NEOPPOD',
     author_email = 'neo-dev@erp5.org',