Merge branch 'origin-2035-arv-mount-tags-folders'

Conflicts:
	sdk/python/bin/arv-mount

diff --cc sdk/python/bin/arv-mount
index cc7e28889104e2b0ab2db6480a724c1b343a7f64,fc5491ff68ccb68c16745ee9032c41d96fe30c4f..e7e559cb6e4b903867c88a072e443d212a83b1b1
--- 1/sdk/python/bin/arv-mount
--- 2/sdk/python/bin/arv-mount
+++ b/sdk/python/bin/arv-mount
@@@ -15,10 -20,12 +20,14 @@@ mountpoint before --exec, or mark the e
  with "--".
  """)
      parser.add_argument('mountpoint', type=str, help="""Mount point.""")
-     parser.add_argument('--collection', type=str, help="""Collection locator""")
 +    parser.add_argument('--allow-other', action='store_true',
 +                        help="""Let other users read the mount""")
+     parser.add_argument('--collection', type=str, help="""Mount only the specified collection at the mount point.""")
+     parser.add_argument('--tags', action='store_true', help="""Mount as a virtual directory consisting of subdirectories representing tagged
+ collections on the server.""")
+     parser.add_argument('--groups', action='store_true', help="""Mount as a virtual directory consisting of subdirectories representing groups on the server.""")
      parser.add_argument('--debug', action='store_true', help="""Debug mode""")
+     parser.add_argument('--foreground', action='store_true', help="""Run in foreground (default is to daemonize unless --exec specified)""", default=False)
      parser.add_argument('--exec', type=str, nargs=argparse.REMAINDER,
                          dest="exec_args", metavar=('command', 'args', '...', '--'),
                          help="""Mount, run a command, then unmount and exit""")
@@@ -37,13 -49,16 +51,13 @@@
          operations.inodes.add_entry(MagicDirectory(llfuse.ROOT_INODE, operations.inodes))
  
      # FUSE options, see mount.fuse(8)
 -    opts = []
 -
 -    # Enable FUSE debugging (logs each FUSE request)
 -    if args.debug:
 -        opts += ['debug']
 +    opts = [optname for optname in ['allow_other', 'debug']
 +            if getattr(args, optname)]
  
-     # Initialize the fuse connection
-     llfuse.init(operations, args.mountpoint, opts)
- 
      if args.exec_args:
+         # Initialize the fuse connection
+         llfuse.init(operations, args.mountpoint, opts)
+ 
          t = threading.Thread(None, lambda: llfuse.main())
          t.start()
  

diff --cc services/api/app/controllers/arvados/v1/schema_controller.rb
Simple merge