Merge branch 'master' into 3198-writable-fuse
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 21 Apr 2015 17:39:36 +0000 (13:39 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 21 Apr 2015 17:39:36 +0000 (13:39 -0400)
commitf69d2824c997c53caa11d30ba816768bad52e12b
treeedc92d56f3779257357035b7db8572fe86b0855e
parent4077a9af0985d3c85f2f2de2bb7a0f6be581e71e
parentc674deff8855005e39b5ddf230372cb241bc22b3
Merge branch 'master' into 3198-writable-fuse

Conflicts:
sdk/python/arvados/arvfile.py
sdk/python/arvados/arvfile.py
sdk/python/arvados/collection.py
sdk/python/arvados/keep.py
sdk/python/tests/test_arvfile.py
sdk/python/tests/test_collections.py