[Checkins] [zopefoundation/ZEO] 02bb66: Merge branch 'ssl' into client-side-conflict-resol...
GitHub
noreply at github.com
Thu Jul 7 16:59:50 CEST 2016
Branch: refs/heads/asyncio
Home: https://github.com/zopefoundation/ZEO
Commit: 02bb6611597b603b5bf485803d33fe82141c5200
https://github.com/zopefoundation/ZEO/commit/02bb6611597b603b5bf485803d33fe82141c5200
Author: Jim Fulton <jim at zope.com>
Date: 2016-07-05 (Tue, 05 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 branch 'ssl' into client-side-conflict-resolution
Conflicts:
src/ZEO/ClientStorage.py
Commit: accd8c023b4c0aedbbd5d16faf63618095588351
https://github.com/zopefoundation/ZEO/commit/accd8c023b4c0aedbbd5d16faf63618095588351
Author: Jim Fulton <jim at zope.com>
Date: 2016-07-06 (Wed, 06 Jul 2016)
Changed paths:
M src/ZEO/StorageServer.py
A src/ZEO/tests/test_client_side_conflict_resolution.py
A src/ZEO/tests/utils.py
Log Message:
-----------
server side
Commit: dabcb601343869fabd1578ccef1b45e904e61a01
https://github.com/zopefoundation/ZEO/commit/dabcb601343869fabd1578ccef1b45e904e61a01
Author: Jim Fulton <jim at zope.com>
Date: 2016-07-06 (Wed, 06 Jul 2016)
Changed paths:
M src/ZEO/ClientStorage.py
M src/ZEO/StorageServer.py
M src/ZEO/TransactionBuffer.py
M src/ZEO/runzeo.py
M src/ZEO/server.xml
M src/ZEO/tests/forker.py
M src/ZEO/tests/test_client_side_conflict_resolution.py
Log Message:
-----------
client side and server config and tweaks
Commit: 4cdbf8b15796cfd2757e1737b63b55f412ba83d1
https://github.com/zopefoundation/ZEO/commit/4cdbf8b15796cfd2757e1737b63b55f412ba83d1
Author: Jim Fulton <jim at zope.com>
Date: 2016-07-06 (Wed, 06 Jul 2016)
Changed paths:
M src/ZEO/tests/CommitLockTests.py
M src/ZEO/tests/ConnectionTests.py
M src/ZEO/tests/testConversionSupport.py
M src/ZEO/tests/testZEO.py
Log Message:
-----------
fixed tests
Commit: 92e49851c8f430c6ff72b4fb4a7e24e0ef391de3
https://github.com/zopefoundation/ZEO/commit/92e49851c8f430c6ff72b4fb4a7e24e0ef391de3
Author: Jim Fulton <jim at zope.com>
Date: 2016-07-07 (Thu, 07 Jul 2016)
Changed paths:
M src/ZEO/tests/forker.py
M src/ZEO/tests/testZEO.py
Log Message:
-----------
run pre-defined conflict-resolution tests with client-side conflict resolution
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)
Commit: e5653d437904db4ab5809cef5257541677800c89
https://github.com/zopefoundation/ZEO/commit/e5653d437904db4ab5809cef5257541677800c89
Author: Jim Fulton <jim at jimfulton.info>
Date: 2016-07-07 (Thu, 07 Jul 2016)
Changed paths:
M src/ZEO/ClientStorage.py
M src/ZEO/StorageServer.py
M src/ZEO/TransactionBuffer.py
M src/ZEO/runzeo.py
M src/ZEO/server.xml
M src/ZEO/tests/CommitLockTests.py
M src/ZEO/tests/ConnectionTests.py
M src/ZEO/tests/forker.py
M src/ZEO/tests/testConversionSupport.py
M src/ZEO/tests/testZEO.py
A src/ZEO/tests/test_client_side_conflict_resolution.py
A src/ZEO/tests/utils.py
Log Message:
-----------
Merge pull request #38 from zopefoundation/client-side-conflict-resolution
Client side conflict resolution
Compare: https://github.com/zopefoundation/ZEO/compare/bff1a14a161d...e5653d437904
More information about the checkins
mailing list