Route sortKey method on Shared.DC.ZRDB.TM from branch to trunk

doc/CHANGES.txt

@@ -73,6 +73,8 @@ Zope Changes
       - Collector #256: Added a check in _doChangeUser to make sure 
         passwords isn't encrypted twice.
 
+      - Added a sortKey() method to Shared.DC.ZRDB.TM to silence warnings
+        from updated ZODB that DAs dont have that method.
 
   Zope 2.6.1 beta 1
 

lib/python/Shared/DC/ZRDB/TM.py

@@ -65,6 +65,14 @@ class TM:
 
     tpc_abort = abort
 
+    def sortKey(self, *ignored):
+        """ The sortKey method is used for recent ZODB compatibility which
+            needs to have a known commit order for lock acquisition.  Most
+            DA's talking to RDBMS systems do not care about commit order, so
+            return the constant 1
+        """
+        return 1
+
 class Surrogate:
 
     def __init__(self, db):