Merge branch '3857-python-sdk-timeouts'
authorTim Pierce <twp@curoverse.com>
Tue, 11 Nov 2014 21:30:04 +0000 (16:30 -0500)
committerTim Pierce <twp@curoverse.com>
Tue, 11 Nov 2014 21:30:04 +0000 (16:30 -0500)
commitec75fda0fc2c86a77d831dcd7962ece7a2d6ae6d
tree15e7d698a6a68bbf7f370fdc648ac276eb11dd47
parent890072727ff9c7f2cdb1864d7170fb74e0247af5
parentd9d7af20beb9f9a09eb755e98d5e25f1a6e3e0e7
Merge branch '3857-python-sdk-timeouts'

Fixes #3857.
sdk/python/arvados/collection.py
sdk/python/setup.py
sdk/python/tests/test_collections.py