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)
commit1034616dcc47472072a5c6e2d7b92c9b95c544c9
tree8711536757b7a6535ba7889ee96942d493135c00
parentcabbceab8a2e164f2c4f5afb0e2062dd02fd7790
parentf82d809aad0833f231765042aaee8ee43f3358ee
Merge branch '6833-test-token-expiry' closes #6833
services/fuse/arvados_fuse/__init__.py
services/fuse/arvados_fuse/fusedir.py