Merge branch '3198-inode-cache' into 3198-writable-fuse, fix tests.
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 7 May 2015 21:11:51 +0000 (17:11 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 7 May 2015 21:11:51 +0000 (17:11 -0400)
commitd2f68bd1e108c3f2dda2322c427050d019b17e04
tree6090d1aab0471afa747219f856c7308a453cf3d4
parent296e1b20ecf2c283508712332f163c06464b3b5d
parent0c01dc225cf57ec886b952440abd0764a85c7a67
Merge branch '3198-inode-cache' into 3198-writable-fuse, fix tests.

Conflicts:
services/fuse/arvados_fuse/__init__.py
services/fuse/arvados_fuse/fresh.py
services/fuse/tests/test_mount.py
services/fuse/arvados_fuse/__init__.py
services/fuse/arvados_fuse/fresh.py
services/fuse/arvados_fuse/fusedir.py
services/fuse/setup.py
services/fuse/tests/test_inodes.py
services/fuse/tests/test_mount.py