[ARVADOS] updated: 1.1.0-54-g5913a5c
Git user
git at public.curoverse.com
Thu Nov 2 10:52:35 EDT 2017
Summary of changes:
doc/_includes/_mount_types.liquid | 2 +-
services/crunch-run/crunchrun.go | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
via 5913a5c085253fb4624411d65229e5b1467ea63a (commit)
from ca92724ab6094bf16729581225122fc9992aa7a7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 5913a5c085253fb4624411d65229e5b1467ea63a
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Thu Nov 2 10:52:15 2017 -0400
12183: Tweak documenation for clarity.
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/doc/_includes/_mount_types.liquid b/doc/_includes/_mount_types.liquid
index 9b3d9cf..4b0508d 100644
--- a/doc/_includes/_mount_types.liquid
+++ b/doc/_includes/_mount_types.liquid
@@ -125,4 +125,4 @@ table(table table-bordered table-condensed).
h2(#symlinks-in-output). Symlinks in output
-When a container's output_path is a tmp mount backed by local disk, this output directory can contain symlinks to other files in the the output directory, or to collection mount points. If the symlink leads to a collection mount, efficiently copy the collection into the output collection. Symlinks leading to files or directories are expanded and created as regular files in the output collection. Further, whether symlinks are relative or absolute, every symlink target (even targets that are symlinks themselves) must either remain in the output directory or point to a collection mount.
+When a container's output_path is a tmp mount backed by local disk, this output directory can contain symlinks to other files in the the output directory, or to collection mount points. If the symlink leads to a collection mount, efficiently copy the collection into the output collection. Symlinks leading to files or directories are expanded and created as regular files in the output collection. Further, whether symlinks are relative or absolute, every symlink target (even targets that are symlinks themselves) must point to a path in either the output directory or a collection mount.
diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index b3e6a4c..3678bd8 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -977,8 +977,8 @@ var limitFollowSymlinks = 10
// for symlinks. If the symlink leads to a keep mount, copy the manifest text
// from the keep mount into the output manifestText. Ensure that whether
// symlinks are relative or absolute, every symlink target (even targets that
-// are symlinks themselves) must either remain in the output directory or point
-// to a collection mount.
+// are symlinks themselves) must point to a path in either the output directory
+// or a collection mount.
//
// Assumes initial value of "path" is absolute, and located within runner.HostOutputDir.
func (runner *ContainerRunner) UploadOutputFile(
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list