diff options
| author | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-04-05 13:37:42 +0500 |
|---|---|---|
| committer | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-04-05 13:37:42 +0500 |
| commit | 7dd93a88ac2b3b9f36e91ad27b7bfe80bfcfb61f (patch) | |
| tree | 7a17cb349b9d564139337bb41b2c237552bd972e /go.mod | |
| parent | 17c6e8e39fd3dd2d3220032bd2ef0d537514257d (diff) | |
| download | seaweedfs-7dd93a88ac2b3b9f36e91ad27b7bfe80bfcfb61f.tar.xz seaweedfs-7dd93a88ac2b3b9f36e91ad27b7bfe80bfcfb61f.zip | |
fix go.mod conflicts
Diffstat (limited to 'go.mod')
| -rw-r--r-- | go.mod | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -148,14 +148,16 @@ require ( ) require ( + github.com/Jille/raft-grpc-transport v1.2.0 github.com/fluent/fluent-logger-golang v1.9.0 github.com/hanwen/go-fuse/v2 v2.1.0 + github.com/hashicorp/raft v1.3.6 + github.com/hashicorp/raft-boltdb v0.0.0-20220329195025-15018e9b97e0 ) require ( cloud.google.com/go/compute v1.5.0 // indirect cloud.google.com/go/iam v0.3.0 // indirect - github.com/Jille/raft-grpc-transport v1.2.0 // indirect github.com/armon/go-metrics v0.3.10 // indirect github.com/aws/aws-sdk-go-v2 v1.16.2 // indirect github.com/aws/aws-sdk-go-v2/config v1.15.3 // indirect @@ -180,8 +182,6 @@ require ( github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-msgpack v1.1.5 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect - github.com/hashicorp/raft v1.3.6 // indirect - github.com/hashicorp/raft-boltdb v0.0.0-20220329195025-15018e9b97e0 // indirect github.com/jcmturner/aescts/v2 v2.0.0 // indirect github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect github.com/jcmturner/goidentity/v6 v6.0.1 // indirect |