aboutsummaryrefslogtreecommitdiff
path: root/go.mod
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2020-05-14 20:06:15 -0700
committerChris Lu <chris.lu@gmail.com>2020-05-14 20:06:15 -0700
commitf8aed8a7f535aa142d0ae3c4f1b8ab52f45ad84a (patch)
tree011a3537f09e3fda8400babb05500e6f251f4e3c /go.mod
parent3fbf6353086214d4e4fc3b29df34d0fa24e578da (diff)
parent09aef5583922042ac4d566c70708464426751b23 (diff)
downloadseaweedfs-f8aed8a7f535aa142d0ae3c4f1b8ab52f45ad84a.tar.xz
seaweedfs-f8aed8a7f535aa142d0ae3c4f1b8ab52f45ad84a.zip
Merge branch 'master' into msg_channel
Diffstat (limited to 'go.mod')
-rw-r--r--go.mod9
1 files changed, 4 insertions, 5 deletions
diff --git a/go.mod b/go.mod
index 2ba8658d3..b1e443934 100644
--- a/go.mod
+++ b/go.mod
@@ -32,7 +32,7 @@ require (
github.com/gocql/gocql v0.0.0-20190829130954-e163eff7a8c6
github.com/gogo/protobuf v1.2.2-0.20190730201129-28a6bbf47e48 // indirect
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
- github.com/golang/protobuf v1.3.2
+ github.com/golang/protobuf v1.4.0
github.com/google/btree v1.0.0
github.com/google/uuid v1.1.1
github.com/gorilla/mux v1.7.3
@@ -56,8 +56,7 @@ require (
github.com/onsi/gomega v1.7.0 // indirect
github.com/peterh/liner v1.1.0
github.com/pierrec/lz4 v2.2.7+incompatible // indirect
- github.com/prometheus/client_golang v1.1.0
- github.com/prometheus/procfs v0.0.4 // indirect
+ github.com/prometheus/client_golang v1.6.0
github.com/rakyll/statik v0.1.7
github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563 // indirect
github.com/seaweedfs/fuse v0.0.0-20190510212405-310228904eff
@@ -67,7 +66,7 @@ require (
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/viper v1.4.0
github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271 // indirect
- github.com/stretchr/testify v1.3.0
+ github.com/stretchr/testify v1.4.0
github.com/syndtr/goleveldb v1.0.0
github.com/tidwall/gjson v1.3.2
github.com/tidwall/match v1.0.1
@@ -84,7 +83,7 @@ require (
golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 // indirect
golang.org/x/image v0.0.0-20200119044424-58c23975cae1 // indirect
golang.org/x/net v0.0.0-20190909003024-a7b16738d86b
- golang.org/x/sys v0.0.0-20190910064555-bbd175535a8b
+ golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f
golang.org/x/tools v0.0.0-20190911022129-16c5e0f7d110
google.golang.org/api v0.9.0
google.golang.org/appengine v1.6.2 // indirect