Merge remote-tracking branch 'origin/asyncio' into client-side-conflict-resolution

Conflicts:
	src/ZEO/ClientStorage.py
	src/ZEO/StorageServer.py

setup.py

@@ -115,7 +115,7 @@ setup(name="ZEO",
       tests_require = tests_require,
       extras_require = dict(test=tests_require),
       install_requires = [
-          'ZODB >= 5.0.0a1',
+          'ZODB >= 5.0.0a5',
           'six',
           'transaction >= 1.6.0',
           'persistent >= 4.1.0',

src/ZEO/ClientStorage.py

@@ -745,6 +745,12 @@ class ClientStorage(ZODB.ConflictResolution.ConflictResolvingStorage):
 
                 vote_attempts += 1
 
+        except POSException.StorageTransactionError:
+            # Hm, we got disconnected and reconnected bwtween
+            # _check_trans and voting. Let's chack the transaction again:
+            self._check_trans(txn, 'tpc_vote')
+            raise
+
         except POSException.ConflictError as err:
             oid = getattr(err, 'oid', None)
             if oid is not None:
@@ -757,11 +763,6 @@ class ClientStorage(ZODB.ConflictResolution.ConflictResolvingStorage):
                 # cache entry is bad and invalidate it.
                 self._cache.invalidate(oid, None)
             raise
-        except POSException.StorageTransactionError:
-            # Hm, we got disconnected and reconnected bwtween
-            # _check_trans and voting. Let's chack the transaction again:
-            tbuf = self._check_trans(txn, 'tpc_vote')
-            raise
 
         if tbuf.exception:
             raise tbuf.exception

src/ZEO/StorageServer.py

@@ -1333,11 +1333,6 @@ class Serving(ServerEvent):
 class Closed(ServerEvent):
     pass
 
-default_cert_authenticate = 'SIGNED'
-def ssl_config(section):
-    from .sslconfig import ssl_config
-    return ssl_config(section, True)
-
 def never_resolve_conflict(oid, committedSerial, oldSerial, newpickle,
                            committedData=b''):
     raise ConflictError(oid=oid, serials=(committedSerial, oldSerial),