[Checkins] [zopefoundation/ZODB] 9d1362: DemoStorage: add support for conflict resolution

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zopefoundation/ZODB
  Commit: 9d13627c1e773ce0caf2d19cf23aa0f826ba2faa
      https://github.com/zopefoundation/ZODB/commit/9d13627c1e773ce0caf2d19cf23aa0f826ba2faa
  Author: Julien Muchembled <jm at nexedi.com>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Changed paths:
    M src/ZODB/ConflictResolution.py
    M src/ZODB/DemoStorage.py
    M src/ZODB/tests/testDemoStorage.py

  Log Message:
  -----------
  DemoStorage: add support for conflict resolution


  Commit: f726e40ac8a85622f8b03d6a672a6ad52ec0b6eb
      https://github.com/zopefoundation/ZODB/commit/f726e40ac8a85622f8b03d6a672a6ad52ec0b6eb
  Author: Julien Muchembled <jm at nexedi.com>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Changed paths:
    M src/ZODB/DemoStorage.py
    M src/ZODB/MappingStorage.py
    M src/ZODB/tests/HistoryStorage.py
    M src/ZODB/tests/testDemoStorage.py

  Log Message:
  -----------
  DemoStorage: fix history()

- It failed with oids that already exist in the base storage.
- MappingStorage returned timestamps in wrong format.


  Commit: 82b3c0f62c32dc51ed113a6aac98ace81903ea7e
      https://github.com/zopefoundation/ZODB/commit/82b3c0f62c32dc51ed113a6aac98ace81903ea7e
  Author: Julien Muchembled <jm at jmuchemb.eu>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Changed paths:
    M CHANGES.rst

  Log Message:
  -----------
  Changelog for PR #58


  Commit: 96183018d9b9014f594f04e215c679b942176038
      https://github.com/zopefoundation/ZODB/commit/96183018d9b9014f594f04e215c679b942176038
  Author: Julien Muchembled <jm at jmuchemb.eu>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M src/ZODB/FileStorage/FileStorage.py

  Log Message:
  -----------
  Remove useless statement in FileStorage

This answers #13


Compare: https://github.com/zopefoundation/ZODB/compare/ee5a462b7f10...96183018d9b9