projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '8363-fuse-warnings'
[arvados.git]
/
sdk
/
go
/
arvados
/
config.go
diff --git
a/sdk/go/arvados/config.go
b/sdk/go/arvados/config.go
index 844991f41e03b219c5b1d1c0c537d5125d9b2413..ad9a4da03cc5f3a7144fadb66d8430e133332866 100644
(file)
--- a/
sdk/go/arvados/config.go
+++ b/
sdk/go/arvados/config.go
@@
-63,7
+63,6
@@
type WebDAVCacheConfig struct {
MaxBlockEntries int
MaxCollectionEntries int
MaxCollectionBytes int64
MaxBlockEntries int
MaxCollectionEntries int
MaxCollectionBytes int64
- MaxPermissionEntries int
MaxUUIDEntries int
MaxSessions int
}
MaxUUIDEntries int
MaxSessions int
}
@@
-138,6
+137,7
@@
type Cluster struct {
BalanceCollectionBatch int
BalanceCollectionBuffers int
BalanceTimeout Duration
BalanceCollectionBatch int
BalanceCollectionBuffers int
BalanceTimeout Duration
+ BalanceUpdateLimit int
WebDAVCache WebDAVCacheConfig
WebDAVCache WebDAVCacheConfig
@@
-233,12
+233,14
@@
type Cluster struct {
NewUserNotificationRecipients StringSet
NewUsersAreActive bool
UserNotifierEmailFrom string
NewUserNotificationRecipients StringSet
NewUsersAreActive bool
UserNotifierEmailFrom string
+ UserNotifierEmailBcc StringSet
UserProfileNotificationAddress string
PreferDomainForUsername string
UserSetupMailText string
}
UserProfileNotificationAddress string
PreferDomainForUsername string
UserSetupMailText string
}
- Volumes map[string]Volume
- Workbench struct {
+ StorageClasses map[string]StorageClassConfig
+ Volumes map[string]Volume
+ Workbench struct {
ActivationContactLink string
APIClientConnectTimeout Duration
APIClientReceiveTimeout Duration
ActivationContactLink string
APIClientConnectTimeout Duration
APIClientReceiveTimeout Duration
@@
-280,6
+282,11
@@
type Cluster struct {
}
}
}
}
+type StorageClassConfig struct {
+ Default bool
+ Priority int
+}
+
type Volume struct {
AccessViaHosts map[URL]VolumeAccess
ReadOnly bool
type Volume struct {
AccessViaHosts map[URL]VolumeAccess
ReadOnly bool