10008: Merge branch 'master' into 10008-flaky-token-test
authorTom Clegg <tom@curoverse.com>
Fri, 21 Oct 2016 19:19:51 +0000 (15:19 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 21 Oct 2016 19:19:51 +0000 (15:19 -0400)
commitdfe0ec7bfec3fd72cd40d3962e5c8af08d2413d2
tree1c792ea7a6a5d32613ff2d2e70ae29db96feb960
parent6349237efb19ca7fcad94333090d694fda3d4374
parent2431a079d91545770bc931fc03afbca81dfa2004
10008: Merge branch 'master' into 10008-flaky-token-test
services/fuse/arvados_fuse/__init__.py
services/fuse/tests/test_mount.py