[Checkins] [zopefoundation/ZODB] c95d47: Added missing change log

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zopefoundation/ZODB
  Commit: c95d47c1a21eaa5faae8d2e1999c83de83e421d5
      https://github.com/zopefoundation/ZODB/commit/c95d47c1a21eaa5faae8d2e1999c83de83e421d5
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M CHANGES.rst

  Log Message:
  -----------
  Added missing change log


  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


  Commit: 19c1de996bb1759de95d5f11eef61191b1674465
      https://github.com/zopefoundation/ZODB/commit/19c1de996bb1759de95d5f11eef61191b1674465
  Author: Julien Muchembled <jm at nexedi.com>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M CHANGES.rst

  Log Message:
  -----------
  Update changelog


  Commit: d377efd3e474e2351e13eb44fb5a3380800f012e
      https://github.com/zopefoundation/ZODB/commit/d377efd3e474e2351e13eb44fb5a3380800f012e
  Author: Jim Fulton <jim at jimfulton.info>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M CHANGES.rst
    M src/ZODB/ConflictResolution.py
    M src/ZODB/Connection.py
    M src/ZODB/tests/testDemoStorage.py

  Log Message:
  -----------
  Merge pull request #83 from zopefoundation/only-vote-reports-conflicts

Only tpc_vote can report resolved conflicts with the new commit protocol


  Commit: bfae36df17b46308e14deaa1107f20bc85d82622
      https://github.com/zopefoundation/ZODB/commit/bfae36df17b46308e14deaa1107f20bc85d82622
  Author: Julien Muchembled <jm at nexedi.com>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M CHANGES.rst
    M src/ZODB/ConflictResolution.py
    M src/ZODB/Connection.py
    M src/ZODB/tests/testDemoStorage.py

  Log Message:
  -----------
  Merge 4.x branch


  Commit: 7e1db13fa462467434c2693a0cee34bc5069a74c
      https://github.com/zopefoundation/ZODB/commit/7e1db13fa462467434c2693a0cee34bc5069a74c
  Author: Julien Muchembled <jm at nexedi.com>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M src/ZODB/BaseStorage.py
    M src/ZODB/DemoStorage.py
    M src/ZODB/FileStorage/FileStorage.py
    M src/ZODB/FileStorage/tests.py
    M src/ZODB/MappingStorage.py
    M src/ZODB/tests/IExternalGC.test
    M src/ZODB/tests/StorageTestBase.py
    M src/ZODB/tests/blob_transaction.txt
    M src/ZODB/tests/testDemoStorage.py
    M src/ZODB/tests/testFileStorage.py

  Log Message:
  -----------
  Switch all storages to the new commit protocol


  Commit: 4d0512f117dad1533fc40ccb746e2edcac312930
      https://github.com/zopefoundation/ZODB/commit/4d0512f117dad1533fc40ccb746e2edcac312930
  Author: Julien Muchembled <jm at nexedi.com>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M src/ZODB/DemoStorage.py
    M src/ZODB/FileStorage/FileStorage.py
    M src/ZODB/MappingStorage.py
    M src/ZODB/tests/blob_transaction.txt

  Log Message:
  -----------
  Various fixes suggested in review


  Commit: 7856af05097858fbac51ffc1475461088f71850a
      https://github.com/zopefoundation/ZODB/commit/7856af05097858fbac51ffc1475461088f71850a
  Author: Jim Fulton <jim at jimfulton.info>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M CHANGES.rst
    M src/ZODB/BaseStorage.py
    M src/ZODB/ConflictResolution.py
    M src/ZODB/Connection.py
    M src/ZODB/DemoStorage.py
    M src/ZODB/FileStorage/FileStorage.py
    M src/ZODB/FileStorage/tests.py
    M src/ZODB/MappingStorage.py
    M src/ZODB/tests/IExternalGC.test
    M src/ZODB/tests/StorageTestBase.py
    M src/ZODB/tests/blob_transaction.txt
    M src/ZODB/tests/testDemoStorage.py
    M src/ZODB/tests/testFileStorage.py

  Log Message:
  -----------
  Merge pull request #82 from zopefoundation/handle_serial

Switch all storages to the new commit protocol

Thanks!


Compare: https://github.com/zopefoundation/ZODB/compare/ae956ad2ebad...7856af050978