projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15107-google-login'
[arvados.git]
/
sdk
/
go
/
arvados
/
config.go
diff --git
a/sdk/go/arvados/config.go
b/sdk/go/arvados/config.go
index a058f6181bba1f7b8bb2cd9e5b2703f78be54aae..6ec8f345d75f430ecd4fe8ffab4bfa665f569770 100644
(file)
--- a/
sdk/go/arvados/config.go
+++ b/
sdk/go/arvados/config.go
@@
-82,7
+82,7
@@
type Cluster struct {
MaxIndexDatabaseRead int
MaxItemsPerResponse int
MaxConcurrentRequests int
MaxIndexDatabaseRead int
MaxItemsPerResponse int
MaxConcurrentRequests int
- MaxKeepBlo
ckBuffers
int
+ MaxKeepBlo
bBuffers
int
MaxRequestAmplification int
MaxRequestSize int
RailsSessionSecretToken string
MaxRequestAmplification int
MaxRequestSize int
RailsSessionSecretToken string
@@
-119,6
+119,11
@@
type Cluster struct {
TrashSweepInterval Duration
TrustAllContent bool
TrashSweepInterval Duration
TrustAllContent bool
+ BlobMissingReport string
+ BalancePeriod Duration
+ BalanceCollectionBatch int
+ BalanceCollectionBuffers int
+
WebDAVCache WebDAVCacheConfig
}
Git struct {
WebDAVCache WebDAVCacheConfig
}
Git struct {
@@
-127,8
+132,10
@@
type Cluster struct {
Repositories string
}
Login struct {
Repositories string
}
Login struct {
- ProviderAppSecret string
+ GoogleClientID string
+ GoogleClientSecret string
ProviderAppID string
ProviderAppID string
+ ProviderAppSecret string
LoginCluster string
RemoteTokenRefresh Duration
}
LoginCluster string
RemoteTokenRefresh Duration
}
@@
-202,6
+209,8
@@
type Cluster struct {
}
UserProfileFormMessage string
VocabularyURL string
}
UserProfileFormMessage string
VocabularyURL string
+ WelcomePageHTML string
+ InactivePageHTML string
}
EnableBetaController14287 bool
}
EnableBetaController14287 bool
@@
-297,9
+306,6
@@
func (su URL) String() string {
}
type ServiceInstance struct {
}
type ServiceInstance struct {
- // Rendezvous is normally empty; when changing the URL of a
- // Keepstore service, Rendezvous can be set to the old URL to
- // preserve rendezvous ordering.
Rendezvous string `json:",omitempty"`
}
Rendezvous string `json:",omitempty"`
}