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

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

diff --cc doc/_config.yml
Simple merge

diff --cc doc/install/install-postgresql.html.textile.liquid
Simple merge

diff --cc lib/config/config.default.yml
index 1c4542e45bbf47a9b8fb4fd5ebe213d8c9fcb338,dc128e56b5aef01d90531317ee61c498b394aa92..aaf88a0d70bbe4c8948d93c5aa63fb12b3af5491
--- 1/lib/config/config.default.yml
--- 2/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@@ -269,24 -274,11 +274,24 @@@ Clusters
        # the current collection.
        CollectionVersioning: false
  
-       #   0 = auto-create a new version on every update.
-       #  -1 = never auto-create new versions.
-       # > 0 = auto-create a new version when older than the specified number of seconds.
-       PreserveVersionIfIdle: -1
+       #   0s = auto-create a new version on every update.
+       #  -1s = never auto-create new versions.
+       # > 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).

diff --cc lib/config/generated_config.go
index ede9f49532310612ebd571edacadab6c96524d69,98cd343bd1698980901cd3ec55461bd3e4953755..15004ca98638c48be9d289bd39b68f18b6d1cb5a
--- 1/lib/config/generated_config.go
--- 2/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@@ -275,24 -280,11 +280,24 @@@ Clusters
        # the current collection.
        CollectionVersioning: false
  
-       #   0 = auto-create a new version on every update.
-       #  -1 = never auto-create new versions.
-       # > 0 = auto-create a new version when older than the specified number of seconds.
-       PreserveVersionIfIdle: -1
+       #   0s = auto-create a new version on every update.
+       #  -1s = never auto-create new versions.
+       # > 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).

diff --cc services/api/app/models/arvados_model.rb
Simple merge