[ARVADOS] updated: 1.3.0-1427-g7e9afd529

[Git user]

Summary of changes:
 lib/config/export.go | 8 ++++++++
 1 file changed, 8 insertions(+)

       via  7e9afd5293736c7006ecfefc4e420393e59de9da (commit)
      from  fdb22c767bb60ebe931a6a86b2fb812dd2073950 (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 7e9afd5293736c7006ecfefc4e420393e59de9da
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Tue Jul 30 12:26:47 2019 -0400

    14813: Fixes cluster config whitelist merge
    
    Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/lib/config/export.go b/lib/config/export.go
index ed330454c..c2eb3f039 100644
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -69,6 +69,9 @@ var whitelist = map[string]bool{
 	"API.MaxRequestSize":                         true,
 	"API.RailsSessionSecretToken":                false,
 	"API.RequestTimeout":                         true,
+	"API.WebsocketClientEventQueue":              false,
+	"API.SendTimeout":                            true,
+	"API.WebsocketServerEventQueue":              false,
 	"AuditLogs":                                  false,
 	"AuditLogs.MaxAge":                           false,
 	"AuditLogs.MaxDeleteBatch":                   false,
@@ -88,6 +91,8 @@ var whitelist = map[string]bool{
 	"Collections.TrustAllContent":                false,
 	"Containers":                                 true,
 	"Containers.CloudVMs":                        false,
+	"Containers.CrunchRunCommand":                false,
+	"Containers.CrunchRunArgumentsList":          false,
 	"Containers.DefaultKeepCacheRAM":             true,
 	"Containers.DispatchPrivateKey":              false,
 	"Containers.JobsAPI":                         true,
@@ -103,9 +108,12 @@ var whitelist = map[string]bool{
 	"Containers.MaxComputeVMs":                   false,
 	"Containers.MaxDispatchAttempts":             false,
 	"Containers.MaxRetryAttempts":                true,
+	"Containers.MinRetryPeriod":                  true,
+	"Containers.ReserveExtraRAM":                 true,
 	"Containers.SLURM":                           false,
 	"Containers.StaleLockTimeout":                false,
 	"Containers.SupportedDockerImageFormats":     true,
+	"Containers.SupportedDockerImageFormats.*":   true,
 	"Containers.UsePreemptibleInstances":         true,
 	"EnableBetaController14287":                  false,
 	"Git":                                          false,

-----------------------------------------------------------------------


hooks/post-receive
--