14287: Merge branch 'master'

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

diff --git a/lib/config/export.go b/lib/config/export.go
index 2f79c2b2969152469d61167306031ce496514537..faf542e6f773c6192779c7aa4dbb5ed0675fe0c5 100644 (file)
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -101,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,