Skip to content

Commit

Permalink
Merge branch 'master' into i171-filesizelimit--wip
Browse files Browse the repository at this point in the history
  • Loading branch information
Ritesh H Shukla authored May 31, 2019
2 parents af4f10b + ae4f4d0 commit 6b9820f
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 19 deletions.
9 changes: 5 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ require (
github.com/docker/go-units v0.3.3
github.com/hashicorp/go-immutable-radix v1.0.0
github.com/hashicorp/golang-lru v0.5.0
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jacobsa/daemonize v0.0.0-20160101105449-e460293e890f
github.com/jacobsa/fuse v0.0.0-20180417054321-cd3959611bcb
github.com/json-iterator/go v1.1.6
github.com/karrick/godirwalk v1.8.0
github.com/kr/pretty v0.1.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/opentracing/opentracing-go v1.0.2
github.com/segmentio/ksuid v1.0.2
github.com/spf13/afero v1.2.2
Expand All @@ -27,14 +28,14 @@ require (
go.uber.org/atomic v1.3.2 // indirect
go.uber.org/multierr v1.1.0 // indirect
go.uber.org/zap v1.9.1
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 // indirect
golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6 // indirect
golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
golang.org/x/sys v0.0.0-20190426135247-a129542de9ae // indirect
golang.org/x/text v0.3.2 // indirect
golang.org/x/tools v0.0.0-20190425222832-ad9eeb80039a // indirect
google.golang.org/api v0.2.0
google.golang.org/grpc v1.19.0
gopkg.in/yaml.v2 v2.2.2
k8s.io/apimachinery v0.0.0-20190531161113-d9689afd32c1 // indirect
k8s.io/kubernetes v1.14.2
k8s.io/utils v0.0.0-20190520173318-324c5df7d3f0 // indirect
)
Loading

0 comments on commit 6b9820f

Please sign in to comment.