Skip to content

Commit

Permalink
Changelog for PR #30.
Browse files Browse the repository at this point in the history
  • Loading branch information
tseaver committed May 22, 2015
1 parent 29d252b commit c997bb2
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.)

Expand Down

0 comments on commit c997bb2

Please sign in to comment.