Merge branch '21606-keep-web-output-buffer'

[arvados.git] / sdk / go / arvados / config.go

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 16d789daf5163f49bc6fe4770565fcde9325fd35..116051b09e3717f0d24c86aa967ae9452eb7877e 100644 (file)
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -63,8 +63,8 @@ func (sc *Config) GetCluster(clusterID string) (*Cluster, error) {
 
 type WebDAVCacheConfig struct {
        TTL                Duration
-       MaxBlockEntries    int
-       MaxCollectionBytes int64
+       DiskCacheSize      ByteSizeOrPercent
+       MaxCollectionBytes ByteSize
        MaxSessions        int
 }
 
@@ -159,6 +159,7 @@ type Cluster struct {
                KeepproxyPermission UploadDownloadRolePermissions
                WebDAVPermission    UploadDownloadRolePermissions
                WebDAVLogEvents     bool
+               WebDAVOutputBuffer  ByteSize
        }
        Git struct {
                GitCommand   string
@@ -545,9 +546,11 @@ type ContainersConfig struct {
                }
        }
        LSF struct {
-               BsubSudoUser      string
-               BsubArgumentsList []string
-               BsubCUDAArguments []string
+               BsubSudoUser       string
+               BsubArgumentsList  []string
+               BsubCUDAArguments  []string
+               MaxRunTimeOverhead Duration
+               MaxRunTimeDefault  Duration
        }
 }