[Checkins] [zopefoundation/ZODB] b14479: Only tpc_vote can report resolved conflicts with t...
GitHub
noreply at github.com
Tue Jul 5 21:16:30 CEST 2016
Branch: refs/heads/4
Home: https://github.com/zopefoundation/ZODB
Commit: b144799323312c459688797a921cc5b20569ae25
https://github.com/zopefoundation/ZODB/commit/b144799323312c459688797a921cc5b20569ae25
Author: Julien Muchembled <jm at nexedi.com>
Date: 2016-07-05 (Tue, 05 Jul 2016)
Changed paths:
M src/ZODB/ConflictResolution.py
M src/ZODB/Connection.py
M src/ZODB/tests/testDemoStorage.py
Log Message:
-----------
Only tpc_vote can report resolved conflicts with the new commit protocol
Commit: 19c1de996bb1759de95d5f11eef61191b1674465
https://github.com/zopefoundation/ZODB/commit/19c1de996bb1759de95d5f11eef61191b1674465
Author: Julien Muchembled <jm at nexedi.com>
Date: 2016-07-05 (Tue, 05 Jul 2016)
Changed paths:
M CHANGES.rst
Log Message:
-----------
Update changelog
Commit: d377efd3e474e2351e13eb44fb5a3380800f012e
https://github.com/zopefoundation/ZODB/commit/d377efd3e474e2351e13eb44fb5a3380800f012e
Author: Jim Fulton <jim at jimfulton.info>
Date: 2016-07-05 (Tue, 05 Jul 2016)
Changed paths:
M CHANGES.rst
M src/ZODB/ConflictResolution.py
M src/ZODB/Connection.py
M src/ZODB/tests/testDemoStorage.py
Log Message:
-----------
Merge pull request #83 from zopefoundation/only-vote-reports-conflicts
Only tpc_vote can report resolved conflicts with the new commit protocol
Compare: https://github.com/zopefoundation/ZODB/compare/c95d47c1a21e...d377efd3e474
More information about the checkins
mailing list