Merge branch 'master' into 3618-column-ordering
[arvados.git] / docker / shell /
drwxr-xr-x   ..
-rw-r--r-- 720 Dockerfile
-rw-r--r-- 216 fuse.conf
-rwxr-xr-x 648 setup.sh.in
-rw-r--r-- 25 superuser_token.in
-rw-r--r-- 207 supervisor.conf