[Checkins] [zopefoundation/ZODB] fdfd53: log ConflictError details

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zopefoundation/ZODB
  Commit: fdfd53cd6382b9f39c23cc64f8077034e7c61621
      https://github.com/zopefoundation/ZODB/commit/fdfd53cd6382b9f39c23cc64f8077034e7c61621
  Author: Adam Groszer <agroszer at gmail.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M src/ZODB/ConflictResolution.py

  Log Message:
  -----------
  log ConflictError details


  Commit: bf188f4a9ebe50c660b3948db96d40844e01dd2a
      https://github.com/zopefoundation/ZODB/commit/bf188f4a9ebe50c660b3948db96d40844e01dd2a
  Author: Adam Groszer <agroszer at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M src/ZODB/ConflictResolution.py

  Log Message:
  -----------
  fix except for py3


  Commit: 33d8ed6fcf9022cd8e73a0abe37c9cdea4691fff
      https://github.com/zopefoundation/ZODB/commit/33d8ed6fcf9022cd8e73a0abe37c9cdea4691fff
  Author: Adam Groszer <agroszer at gmail.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

  Changed paths:
    M src/ZODB/ConflictResolution.py

  Log Message:
  -----------
  demoting log entry to debug


  Commit: bdc633a81e95aec7a90db454c2a7ac7904a853cc
      https://github.com/zopefoundation/ZODB/commit/bdc633a81e95aec7a90db454c2a7ac7904a853cc
  Author: Adam Groszer <agroszer at gmail.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

  Changed paths:
    M src/ZODB/ConflictResolution.py

  Log Message:
  -----------
  added a bit more info to the log entry


  Commit: db98563c6d030bcd23723ea5e50a160679d269ec
      https://github.com/zopefoundation/ZODB/commit/db98563c6d030bcd23723ea5e50a160679d269ec
  Author: Adam Groszer <agroszer at gmail.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

  Changed paths:
    M src/ZODB/tests/testconflictresolution.py

  Log Message:
  -----------
  added test to check tryToResolveConflict log output


  Commit: 0a7ee5ceac31f206e0f4326954929db731634934
      https://github.com/zopefoundation/ZODB/commit/0a7ee5ceac31f206e0f4326954929db731634934
  Author: Adam Groszer <agroszer at gmail.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

  Changed paths:
    M src/ZODB/tests/testconflictresolution.py

  Log Message:
  -----------
  fixed ResolveableWhenStateDoesNotChange, changed show_tryToResolveConflict_log_output to check both cases


  Commit: 904300f141b9cebd7efc0f349df2f63f9708b541
      https://github.com/zopefoundation/ZODB/commit/904300f141b9cebd7efc0f349df2f63f9708b541
  Author: Adam Groszer <agroszer at gmail.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

  Changed paths:
    M src/ZODB/ConflictResolution.py
    M src/ZODB/tests/testconflictresolution.py

  Log Message:
  -----------
  forgot to add class name as requested by Jim


  Commit: 29d252b823c8d415834498c7c755d3031a8de78d
      https://github.com/zopefoundation/ZODB/commit/29d252b823c8d415834498c7c755d3031a8de78d
  Author: Tres Seaver <tseaver at palladion.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M src/ZODB/ConflictResolution.py
    M src/ZODB/tests/testconflictresolution.py

  Log Message:
  -----------
  Merge pull request #30 from Shoobx/master

log ConflictError details, fixes #29


Compare: https://github.com/zopefoundation/ZODB/compare/e95536d215a9...29d252b823c8