Merge branch 'master' into 3198-writable-fuse
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 12 May 2015 17:05:38 +0000 (13:05 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 12 May 2015 17:05:38 +0000 (13:05 -0400)
commit682dd5b6cc23a455766a7651e3e841257660b31c
tree3264595fbe04a5ff252d84c7f80968e54e48d9c4
parentd2f68bd1e108c3f2dda2322c427050d019b17e04
parentdd5deb94678d0a0054cf1c4d7dafe864c86094fd
Merge branch 'master' into 3198-writable-fuse

Conflicts:
sdk/python/arvados/arvfile.py
sdk/python/arvados/keep.py
services/fuse/arvados_fuse/__init__.py
sdk/python/arvados/arvfile.py
sdk/python/tests/test_arvfile.py
sdk/python/tests/test_collections.py
services/fuse/arvados_fuse/__init__.py
services/fuse/arvados_fuse/fusedir.py
services/fuse/tests/test_inodes.py