projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15799-baseurl-missing-slash'
[arvados.git]
/
sdk
/
go
/
arvados
/
config.go
diff --git
a/sdk/go/arvados/config.go
b/sdk/go/arvados/config.go
index 7c1c3538094869ff82a510226575a2dbbd0491ab..6ec8f345d75f430ecd4fe8ffab4bfa665f569770 100644
(file)
--- a/
sdk/go/arvados/config.go
+++ b/
sdk/go/arvados/config.go
@@
-132,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
}
@@
-207,6
+209,8
@@
type Cluster struct {
}
UserProfileFormMessage string
VocabularyURL string
}
UserProfileFormMessage string
VocabularyURL string
+ WelcomePageHTML string
+ InactivePageHTML string
}
EnableBetaController14287 bool
}
EnableBetaController14287 bool