Merge branch '6833-test-token-expiry' closes #6833
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 21 Jan 2016 22:25:22 +0000 (17:25 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 21 Jan 2016 22:25:22 +0000 (17:25 -0500)
1  2 
services/fuse/arvados_fuse/__init__.py
services/fuse/arvados_fuse/fusedir.py

Simple merge