{"push_id":1192868352,"size":8,"distinct_size":1,"ref":"refs/heads/asyncio","head":"e5653d437904db4ab5809cef5257541677800c89","before":"bff1a14a161deb4a1b53a8d2e48643baddf5dae7","commits":[{"sha":"02bb6611597b603b5bf485803d33fe82141c5200","author":{"name":"Jim Fulton","email":"e3a16e9ace25eabbd302f2bef793087beb8ecdce@zope.com"},"message":"Merge branch 'ssl' into client-side-conflict-resolution\n\nConflicts:\n\tsrc/ZEO/ClientStorage.py","distinct":false,"url":"https://api.github.com/repos/zopefoundation/ZEO/commits/02bb6611597b603b5bf485803d33fe82141c5200"},{"sha":"accd8c023b4c0aedbbd5d16faf63618095588351","author":{"name":"Jim Fulton","email":"e3a16e9ace25eabbd302f2bef793087beb8ecdce@zope.com"},"message":"server side","distinct":false,"url":"https://api.github.com/repos/zopefoundation/ZEO/commits/accd8c023b4c0aedbbd5d16faf63618095588351"},{"sha":"dabcb601343869fabd1578ccef1b45e904e61a01","author":{"name":"Jim Fulton","email":"e3a16e9ace25eabbd302f2bef793087beb8ecdce@zope.com"},"message":"client side and server config and tweaks","distinct":false,"url":"https://api.github.com/repos/zopefoundation/ZEO/commits/dabcb601343869fabd1578ccef1b45e904e61a01"},{"sha":"4cdbf8b15796cfd2757e1737b63b55f412ba83d1","author":{"name":"Jim Fulton","email":"e3a16e9ace25eabbd302f2bef793087beb8ecdce@zope.com"},"message":"fixed tests","distinct":false,"url":"https://api.github.com/repos/zopefoundation/ZEO/commits/4cdbf8b15796cfd2757e1737b63b55f412ba83d1"},{"sha":"92e49851c8f430c6ff72b4fb4a7e24e0ef391de3","author":{"name":"Jim Fulton","email":"e3a16e9ace25eabbd302f2bef793087beb8ecdce@zope.com"},"message":"run pre-defined conflict-resolution tests with client-side conflict resolution","distinct":false,"url":"https://api.github.com/repos/zopefoundation/ZEO/commits/92e49851c8f430c6ff72b4fb4a7e24e0ef391de3"},{"sha":"5a5320e625fc6899fb3cfcf8d986c13f54848c94","author":{"name":"Jim Fulton","email":"e3a16e9ace25eabbd302f2bef793087beb8ecdce@zope.com"},"message":"Merge remote-tracking branch 'origin/asyncio' into client-side-conflict-resolution\n\nConflicts:\n\tsrc/ZEO/ClientStorage.py\n\tsrc/ZEO/StorageServer.py","distinct":false,"url":"https://api.github.com/repos/zopefoundation/ZEO/commits/5a5320e625fc6899fb3cfcf8d986c13f54848c94"},{"sha":"10d7f9ffa115ece8d94e51bbddc601a8d670a69e","author":{"name":"Jim Fulton","email":"e3a16e9ace25eabbd302f2bef793087beb8ecdce@zope.com"},"message":"fixed a waitpid call (unrelated to rest of branch, sorry)","distinct":false,"url":"https://api.github.com/repos/zopefoundation/ZEO/commits/10d7f9ffa115ece8d94e51bbddc601a8d670a69e"},{"sha":"e5653d437904db4ab5809cef5257541677800c89","author":{"name":"Jim Fulton","email":"e3a16e9ace25eabbd302f2bef793087beb8ecdce@jimfulton.info"},"message":"Merge pull request #38 from zopefoundation/client-side-conflict-resolution\n\nClient side conflict resolution","distinct":true,"url":"https://api.github.com/repos/zopefoundation/ZEO/commits/e5653d437904db4ab5809cef5257541677800c89"}]}
{"actor":{"display_login":"jimfulton"}}