Merge branch 'master' into 14874-protected-collection-properties

[arvados.git] / lib / config / config.default.yml

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index dc128e56b5aef01d90531317ee61c498b394aa92..aaf88a0d70bbe4c8948d93c5aa63fb12b3af5491 100644 (file)
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -279,6 +279,19 @@ Clusters:
       # > 0s = auto-create a new version when older than the specified number of seconds.
       PreserveVersionIfIdle: -1s
 
+      # Managed collection properties. At creation time, if the client didn't
+      # provide the listed keys, they will be automatically populated following
+      # one of the following behaviors:
+      #
+      # * UUID of the user who owns the containing project.
+      #   responsible_person_uuid: {function: original_owner, protected: true}
+      #
+      # * Default concrete value.
+      #   foo_bar: {value: baz, protected: false}
+      #
+      # If protected is true, only an admin user can modify its value.
+      ManagedProperties: {}
+
     Login:
       # These settings are provided by your OAuth2 provider (e.g.,
       # sso-provider).