[Checkins] [zopefoundation/ZEO] 54c31e: require newer ZODB needed for tests to pass

[GitHub]

  Branch: refs/heads/client-side-conflict-resolution
  Home:   https://github.com/zopefoundation/ZEO
  Commit: 54c31e71bfa51085d6f093d6060bc901c5cdf555
      https://github.com/zopefoundation/ZEO/commit/54c31e71bfa51085d6f093d6060bc901c5cdf555
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  require newer ZODB needed for tests to pass


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

  Changed paths:
    M setup.py
    M src/ZEO/ClientStorage.py
    M src/ZEO/StorageServer.py
    M src/ZEO/TransactionBuffer.py
    M src/ZEO/asyncio/server.py
    M src/ZEO/asyncio/tests.py
    M src/ZEO/cache.py
    M src/ZEO/interfaces.py
    M src/ZEO/tests/ConnectionTests.py
    M src/ZEO/tests/forker.py
    M src/ZEO/tests/protocols.test
    M src/ZEO/tests/testZEO.py
    M src/ZEO/tests/testZEO2.py

  Log Message:
  -----------
  Merge pull request #35 from zopefoundation/implement-IMultiCommitStorage

Implement iMultiCommitStorage


  Commit: 2f0021335aabb9501a57b69e1c7ac5266de05624
      https://github.com/zopefoundation/ZEO/commit/2f0021335aabb9501a57b69e1c7ac5266de05624
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M setup.py
    M src/ZEO/ClientStorage.py
    M src/ZEO/StorageServer.py
    M src/ZEO/TransactionBuffer.py
    M src/ZEO/asyncio/server.py
    M src/ZEO/asyncio/tests.py
    M src/ZEO/cache.py
    M src/ZEO/interfaces.py
    M src/ZEO/tests/ConnectionTests.py
    M src/ZEO/tests/forker.py
    M src/ZEO/tests/protocols.test
    M src/ZEO/tests/testZEO.py
    M src/ZEO/tests/testZEO2.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/asyncio' into ssl

Conflicts:
	src/ZEO/ClientStorage.py


  Commit: 22615fb463cd57979a411cc636f30a7965886be4
      https://github.com/zopefoundation/ZEO/commit/22615fb463cd57979a411cc636f30a7965886be4
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M src/ZEO/StorageServer.py

  Log Message:
  -----------
  removed some unused code


  Commit: 1eb086dae13b17304f5d4b0614872be3bb4aa447
      https://github.com/zopefoundation/ZEO/commit/1eb086dae13b17304f5d4b0614872be3bb4aa447
  Author: Jim Fulton <jim at jimfulton.info>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M .travis.yml
    A doc/README.rst
    R doc/zeo.txt
    M setup.py
    M src/ZEO/ClientStorage.py
    M src/ZEO/StorageServer.py
    M src/ZEO/__init__.py
    R src/ZEO/acceptor.py
    A src/ZEO/asyncio/README.rst
    M src/ZEO/asyncio/client.py
    A src/ZEO/asyncio/mtacceptor.py
    M src/ZEO/asyncio/server.py
    M src/ZEO/asyncio/testing.py
    M src/ZEO/component.xml
    M src/ZEO/runzeo.py
    M src/ZEO/schema.xml
    A src/ZEO/server.xml
    M src/ZEO/tests/CommitLockTests.py
    M src/ZEO/tests/ConnectionTests.py
    A src/ZEO/tests/client.pem
    A src/ZEO/tests/client_key.pem
    M src/ZEO/tests/dynamic_server_ports.test
    M src/ZEO/tests/forker.py
    M src/ZEO/tests/new_addr.test
    A src/ZEO/tests/server.pem
    A src/ZEO/tests/server_key.pem
    A src/ZEO/tests/serverpw.pem
    A src/ZEO/tests/serverpw_key.pem
    M src/ZEO/tests/testConfig.py
    M src/ZEO/tests/testConnection.py
    M src/ZEO/tests/testZEO.py
    A src/ZEO/tests/testssl.py
    A src/ZEO/zconfig.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #32 from zopefoundation/ssl

Add SSL support +

It's sad no reviewer, but I suppose it can be reviewed even after a merge.


  Commit: 5a5320e625fc6899fb3cfcf8d986c13f54848c94
      https://github.com/zopefoundation/ZEO/commit/5a5320e625fc6899fb3cfcf8d986c13f54848c94
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M setup.py
    M src/ZEO/ClientStorage.py
    M src/ZEO/StorageServer.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/asyncio' into client-side-conflict-resolution

Conflicts:
	src/ZEO/ClientStorage.py
	src/ZEO/StorageServer.py


  Commit: 10d7f9ffa115ece8d94e51bbddc601a8d670a69e
      https://github.com/zopefoundation/ZEO/commit/10d7f9ffa115ece8d94e51bbddc601a8d670a69e
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M src/ZEO/tests/forker.py

  Log Message:
  -----------
  fixed a waitpid call (unrelated to rest of branch, sorry)


Compare: https://github.com/zopefoundation/ZEO/compare/92e49851c8f4...10d7f9ffa115