14287: Merge branch 'master'

[arvados.git] / lib / config / export.go

diff --git a/lib/config/export.go b/lib/config/export.go
index 39344c0f0497c859949d168d799a538bdc579e6c..faf542e6f773c6192779c7aa4dbb5ed0675fe0c5 100644 (file)
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -75,6 +75,9 @@ var whitelist = map[string]bool{
        "Collections.CollectionVersioning":           false,
        "Collections.DefaultReplication":             true,
        "Collections.DefaultTrashLifetime":           true,
+       "Collections.ManagedProperties":              true,
+       "Collections.ManagedProperties.*":            true,
+       "Collections.ManagedProperties.*.*":          true,
        "Collections.PreserveVersionIfIdle":          true,
        "Collections.TrashSweepInterval":             false,
        "Containers":                                 true,
@@ -98,6 +101,7 @@ var whitelist = map[string]bool{
        "Containers.StaleLockTimeout":                false,
        "Containers.SupportedDockerImageFormats":     true,
        "Containers.UsePreemptibleInstances":         true,
+       "EnableBetaController14287":                  false,
        "Git":                                        false,
        "InstanceTypes":                              true,
        "InstanceTypes.*":                            true,