diff options
| author | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-05-03 10:47:39 +0500 |
|---|---|---|
| committer | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-05-03 10:47:39 +0500 |
| commit | 2d27afb51541de9cb64592813e63fde5394e13ef (patch) | |
| tree | 86b5bd43482c7bb9bf394b0abf290e62d80a27b4 | |
| parent | f6d90e12a63687f30454ede1423c67b94fe0db57 (diff) | |
| parent | e82233efa783a987d3874580956c6b9f5351f801 (diff) | |
| download | seaweedfs-2d27afb51541de9cb64592813e63fde5394e13ef.tar.xz seaweedfs-2d27afb51541de9cb64592813e63fde5394e13ef.zip | |
Merge branch 'new_master' into ydb
| -rw-r--r-- | .github/workflows/binaries_dev.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/binaries_release2.yml | 3 | ||||
| -rw-r--r-- | weed/storage/backend/s3_backend/s3_backend.go | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/.github/workflows/binaries_dev.yml b/.github/workflows/binaries_dev.yml index b897732f6..29b1cf6ab 100644 --- a/.github/workflows/binaries_dev.yml +++ b/.github/workflows/binaries_dev.yml @@ -82,8 +82,7 @@ jobs: strategy: matrix: goos: [darwin] - # goarch: [amd64, arm64] - goarch: [amd64] + goarch: [amd64, arm64] steps: diff --git a/.github/workflows/binaries_release2.yml b/.github/workflows/binaries_release2.yml index b6613483b..09e8fc7ae 100644 --- a/.github/workflows/binaries_release2.yml +++ b/.github/workflows/binaries_release2.yml @@ -23,8 +23,7 @@ jobs: strategy: matrix: goos: [darwin] - # goarch: [amd64, arm64] - goarch: [amd64] + goarch: [amd64, arm64] # Steps represent a sequence of tasks that will be executed as part of the job steps: diff --git a/weed/storage/backend/s3_backend/s3_backend.go b/weed/storage/backend/s3_backend/s3_backend.go index b516062a8..c68712d58 100644 --- a/weed/storage/backend/s3_backend/s3_backend.go +++ b/weed/storage/backend/s3_backend/s3_backend.go @@ -49,7 +49,7 @@ func newS3BackendStorage(configuration backend.StringProperties, configPrefix st s.region = configuration.GetString(configPrefix + "region") s.bucket = configuration.GetString(configPrefix + "bucket") s.endpoint = configuration.GetString(configPrefix + "endpoint") - s.storageClass = configuration.GetString(configPrefix + "storageClass") + s.storageClass = configuration.GetString(configPrefix + "storage_class") if s.storageClass == "" { s.storageClass = "STANDARD_IA" } |