3198: Rename --enable-write to --read-write. Tweak docs.

diff --git a/doc/user/tutorials/tutorial-keep-mount.html.textile.liquid b/doc/user/tutorials/tutorial-keep-mount.html.textile.liquid
index c219544d238faf807f6c0f8eed15c41d4e1e3c84..43af024df2df7d8ce9e00d4ce9ac1a2aaca65eb9 100644 (file)
--- a/doc/user/tutorials/tutorial-keep-mount.html.textile.liquid
+++ b/doc/user/tutorials/tutorial-keep-mount.html.textile.liquid
@@ -49,7 +49,8 @@ Not supported:
 * Symlinks, hard links
 * Changing permissions
 * Extended attributes
+* Moving a subdirectory of a collection into a project, or moving a collection from a project into another collection
 
-If multiple clients try to modify the same file in the same collection, this result in a conflict.  In this case, the most recent file wins, and the "loser" will be renamed to a conflict file in the form @name~YYYYMMDD-HHMMSS~conflict~@.
+If multiple clients (separate instances of arv-mount or other arvados applications) modify the same file in the same collection within a short time interval, this may result in a conflict.  In this case, the most recent commit wins, and the "loser" will be renamed to a conflict file in the form @name~YYYYMMDD-HHMMSS~conflict~@.
 
 Please note this feature is in beta testing.  In particular, the conflict mechanism is itself currently subject to race condiditions with potential for data loss when a collection is being modified simultaneously by multiple clients.  This issue will be resolved in future development.

diff --git a/services/fuse/bin/arv-mount b/services/fuse/bin/arv-mount
index 34985002340ce1d8b948c4257f12287e8682aa07..7f9c916c456f49e76744f78ba06b18af2eb1ed1b 100755 (executable)
--- a/services/fuse/bin/arv-mount
+++ b/services/fuse/bin/arv-mount
@@ -51,7 +51,7 @@ with "--".
     parser.add_argument('--directory-cache', type=int, help="Directory data cache size, in bytes (default 128MiB)", default=128*1024*1024)
 
     parser.add_argument('--read-only', action='store_false', help="Mount will be read only (default)", dest="enable_write", default=False)
-    parser.add_argument('--enable-write', action='store_true', help="Mount will be read-write", dest="enable_write", default=False)
+    parser.add_argument('--read-write', action='store_true', help="Mount will be read-write", dest="enable_write", default=False)
 
     parser.add_argument('--exec', type=str, nargs=argparse.REMAINDER,
                         dest="exec_args", metavar=('command', 'args', '...', '--'),
@@ -87,7 +87,7 @@ with "--".
         arvados.logger.setLevel(logging.DEBUG)
         logger.debug("arv-mount debugging enabled")
 
-    logger.warn("enable write is %s", args.enable_write)
+    logger.info("enable write is %s", args.enable_write)
 
     try:
         # Create the request handler