Merge branch 'master' into engine

This commit is contained in:
Adrian Gallagher
2019-07-07 06:06:30 +10:00
5 changed files with 82 additions and 50 deletions

4
go.mod
View File

@@ -6,7 +6,7 @@ require (
github.com/gogo/protobuf v1.2.1 // indirect
github.com/golang/protobuf v1.3.1
github.com/google/go-querystring v1.0.0
github.com/gorilla/mux v1.7.2
github.com/gorilla/mux v1.7.3
github.com/gorilla/websocket v1.4.0
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0
github.com/grpc-ecosystem/grpc-gateway v1.9.2
@@ -14,7 +14,7 @@ require (
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
github.com/urfave/cli v1.20.0
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5
golang.org/x/net v0.0.0-20190606173856-1492cefac77f
golang.org/x/net v0.0.0-20190606173856-1492cefac77f // indirect
google.golang.org/genproto v0.0.0-20190605220351-eb0b1bdb6ae6
google.golang.org/grpc v1.21.1
)