projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8900727 d9d7af2)
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)
Fixes #3857.

1  2 
sdk/python/arvados/collection.py patch | diff1 | diff2 | blob | history
sdk/python/setup.py patch | diff1 | diff2 | blob | history
sdk/python/tests/test_collections.py patch | diff1 | diff2 | blob | history

diff --cc sdk/python/arvados/collection.py
Simple merge
diff --cc sdk/python/setup.py
Simple merge
diff --cc sdk/python/tests/test_collections.py
Simple merge