• Jim Fulton's avatar
    Merge remote-tracking branch 'origin/master' into asyncio · dcbeab41
    Jim Fulton authored
    Conflicts:
    	.travis.yml
    	setup.py
    	src/ZEO/ClientStorage.py
    	src/ZEO/cache.py
    	src/ZEO/tests/testZEO.py
    	src/ZEO/zrpc/client.py
    	src/ZEO/zrpc/server.py
    
    Also, removed load from the asyncion client implementation, since it
    isn't used anymore.
    dcbeab41
setup.py 4.31 KB