Skip to content
Snippets Groups Projects
Commit 55b44efd authored by Richard T. Carback III's avatar Richard T. Carback III
Browse files

Merge branch 'windowSize' into 'release'

GRPC Update

See merge request !629
parents 4340e7a7 78173aeb
No related branches found
No related tags found
1 merge request!23Release
......@@ -4,7 +4,7 @@ go 1.13
require (
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
github.com/golang/protobuf v1.4.3
github.com/golang/protobuf v1.5.2
github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect
github.com/magiconair/properties v1.8.4 // indirect
github.com/mitchellh/mapstructure v1.4.0 // indirect
......@@ -17,21 +17,17 @@ require (
github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/viper v1.7.1
gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228
gitlab.com/elixxir/comms v0.0.4-0.20210527192434-4f4f53730861
gitlab.com/elixxir/crypto v0.0.7-0.20210526002540-1fb51df5b4b2
gitlab.com/elixxir/comms v0.0.4-0.20210601203030-66682d6e5941
gitlab.com/elixxir/crypto v0.0.7-0.20210601193549-039f62f2d81a
gitlab.com/elixxir/ekv v0.1.5
gitlab.com/elixxir/primitives v0.0.3-0.20210526002350-b9c947fec050
gitlab.com/xx_network/comms v0.0.4-0.20210526002311-2b5a66af0eac
gitlab.com/xx_network/crypto v0.0.5-0.20210526002149-9c08ccb202be
gitlab.com/xx_network/primitives v0.0.4-0.20210525232109-3f99a04adcfd
gitlab.com/xx_network/ring v0.0.3-0.20210527191221-ce3f170aabd5 // indirect
gitlab.com/elixxir/primitives v0.0.3-0.20210601193429-3279a7c13c83
gitlab.com/xx_network/comms v0.0.4-0.20210601202447-1054921961b7
gitlab.com/xx_network/crypto v0.0.5-0.20210601193257-27ba5d088733
gitlab.com/xx_network/primitives v0.0.4-0.20210601193218-658388fcaa81
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 // indirect
golang.org/x/net v0.0.0-20210525063256-abc453219eb5
google.golang.org/genproto v0.0.0-20210105202744-fe13368bc0e1 // indirect
google.golang.org/grpc v1.34.0 // indirect
google.golang.org/protobuf v1.26.0-rc.1
google.golang.org/protobuf v1.26.0
gopkg.in/ini.v1 v1.62.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
replace google.golang.org/grpc => github.com/grpc/grpc-go v1.27.1
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment