Changelog for PR #30.

c997bb2e · Tres Seaver · 29d252b8 · c997bb2e
Commit c997bb2e authored May 22, 2015 by Tres Seaver
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

CHANGES.rst CHANGES.rst +3 -0

No files found.
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,9 @@
 4.2.0 (unreleased)
 ==================

+- Log failed conflict resolution attempts at ``DEBUG`` level.  See:
+  https://github.com/zopefoundation/ZODB/pull/29.
+
 - Fix command-line parsing of --verbose and --verify arguments.
  (The short versions -v and -V were parsed correctly.)