gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into mq

Browse Source
This commit is contained in:
chrislu
2024-05-23 08:25:27 -07:00
parent d40b350f54 ba98f02d02
commit 77a7c5c2a0
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
k8s/charts/seaweedfs/Chart.yaml
View File

@@ -2,4 +2,4 @@ apiVersion: v1
description: SeaweedFS description: SeaweedFS
name: seaweedfs name: seaweedfs
appVersion: "3.67" appVersion: "3.67"
version: 3.67.0 version: 3.67.1

2
weed/replication/sink/s3sink/s3_sink.go
View File

@@ -1,6 +1,7 @@
package S3Sink package S3Sink
import ( import (
"encoding/base64"
"fmt" "fmt"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/credentials"
@@ -11,7 +12,6 @@ import (
"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"
"strconv" "strconv"
"strings" "strings"
"encoding/base64"
"github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/filer"
"github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/glog"

1
weed/stats/disk_openbsd.go
View File

@@ -22,4 +22,3 @@ func fillInDiskStatus(disk *volume_server_pb.DiskStatus) {
disk.PercentUsed = float32((float64(disk.Used) / float64(disk.All)) * 100) disk.PercentUsed = float32((float64(disk.Used) / float64(disk.All)) * 100)
return return
} }