gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'new_master' into ydb

Browse source
This commit is contained in:
Konstantin Lebedev 2022-05-03 10:47:39 +05:00
parent f6d90e12a6 e82233efa7
commit 2d27afb515
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/binaries_dev.yml vendored
View file

@ -82,8 +82,7 @@ jobs:
strategy: strategy:
matrix: matrix:
goos: [darwin] goos: [darwin]
# goarch: [amd64, arm64] goarch: [amd64, arm64]
goarch: [amd64]
steps: steps:

3
.github/workflows/binaries_release2.yml vendored
View file

@ -23,8 +23,7 @@ jobs:
strategy: strategy:
matrix: matrix:
goos: [darwin] goos: [darwin]
# goarch: [amd64, arm64] goarch: [amd64, arm64]
goarch: [amd64]
# Steps represent a sequence of tasks that will be executed as part of the job # Steps represent a sequence of tasks that will be executed as part of the job
steps: steps:

2
weed/storage/backend/s3_backend/s3_backend.go
View file

@ -49,7 +49,7 @@ func newS3BackendStorage(configuration backend.StringProperties, configPrefix st
s.region = configuration.GetString(configPrefix + "region") s.region = configuration.GetString(configPrefix + "region")
s.bucket = configuration.GetString(configPrefix + "bucket") s.bucket = configuration.GetString(configPrefix + "bucket")
s.endpoint = configuration.GetString(configPrefix + "endpoint") s.endpoint = configuration.GetString(configPrefix + "endpoint")
s.storageClass = configuration.GetString(configPrefix + "storageClass") s.storageClass = configuration.GetString(configPrefix + "storage_class")
if s.storageClass == "" { if s.storageClass == "" {
s.storageClass = "STANDARD_IA" s.storageClass = "STANDARD_IA"
} }