Merge branch 'master' into 2752-arv-put-resume-wip
authorBrett Smith <brett@curoverse.com>
Wed, 28 May 2014 14:35:11 +0000 (10:35 -0400)
committerBrett Smith <brett@curoverse.com>
Wed, 28 May 2014 14:35:11 +0000 (10:35 -0400)
commit491785dcf514640d80b83b32d867002852940140
tree0590594e645dc634fc5c932ee954383c347809ed
parent44203eefb793d8523e895d417ab4b726f63ec4c9
parent122e392ac6d9b36e376937f4dc2f910118b112ac
Merge branch 'master' into 2752-arv-put-resume-wip

Conflicts:
sdk/python/arvados/errors.py
sdk/python/arvados/errors.py
sdk/python/arvados/keep.py
sdk/python/tests/run_test_server.py
sdk/python/tests/test_keep_client.py