[Checkins] [zopefoundation/ZODB] b14479: Only tpc_vote can report resolved conflicts with t...

[GitHub]

  Branch: refs/heads/only-vote-reports-conflicts
  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