Merge branch 'master' into 4823-python-sdk-writable-collection-api
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 12 Feb 2015 18:35:38 +0000 (13:35 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 12 Feb 2015 18:35:38 +0000 (13:35 -0500)
commitf6b88a9e7e9727f0397f1febbad8c08f6a20463d
tree317b7ac216ec91fba2bb991ce0e952ffa9a6a859
parent8128b451b8e3161ae3db8b7e1858f6eef8105c9f
parent857d5a70bcff7d3634d6daf9886fdfe6d46d681c
Merge branch 'master' into 4823-python-sdk-writable-collection-api

Conflicts:
sdk/python/arvados/collection.py
sdk/python/tests/test_keep_client.py
sdk/python/arvados/collection.py
sdk/python/arvados/commands/put.py
sdk/python/arvados/keep.py
sdk/python/tests/arvados_testutil.py
sdk/python/tests/test_collections.py
sdk/python/tests/test_keep_client.py
services/fuse/arvados_fuse/__init__.py