projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16306: Merge branch 'master'
[arvados.git]
/
lib
/
config
/
generated_config.go
diff --git
a/lib/config/generated_config.go
b/lib/config/generated_config.go
index 934131bd8fd90e0085de2532e7f86e43f0709563..514fafaded7371d7f320bca5d1feacb0c5e32497 100644
(file)
--- a/
lib/config/generated_config.go
+++ b/
lib/config/generated_config.go
@@
-220,11
+220,6
@@
Clusters:
# serving a single incoming multi-cluster (federated) request.
MaxRequestAmplification: 4
# serving a single incoming multi-cluster (federated) request.
MaxRequestAmplification: 4
- # RailsSessionSecretToken is a string of alphanumeric characters
- # used by Rails to sign session tokens. IMPORTANT: This is a
- # site secret. It should be at least 50 characters.
- RailsSessionSecretToken: ""
-
# Maximum wall clock time to spend handling an incoming request.
RequestTimeout: 5m
# Maximum wall clock time to spend handling an incoming request.
RequestTimeout: 5m
@@
-1053,7
+1048,7
@@
Clusters:
# Cloud-specific driver parameters.
DriverParameters:
# Cloud-specific driver parameters.
DriverParameters:
- # (ec2) Credentials.
+ # (ec2) Credentials.
Omit or leave blank if using IAM role.
AccessKeyID: ""
SecretAccessKey: ""
AccessKeyID: ""
SecretAccessKey: ""