Skip to content
This repository has been archived by the owner on Jul 12, 2024. It is now read-only.

Commit

Permalink
Manually applied fix for: Update x/crypto version (jaegertracing#1136)…
Browse files Browse the repository at this point in the history 
…, as cherry-pick pulled in unrelated changes
  • Loading branch information
@objectiser
objectiser committed Jul 20, 2020
1 parent f67e54b commit 3d3ced1
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 5 deletions.
1 change: 1 addition & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ require (
github.com/uber/jaeger-lib v2.2.0+incompatible // indirect
go.opentelemetry.io/otel v0.1.2
go.opentelemetry.io/otel/exporter/trace/jaeger v0.1.2
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 // indirect
golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271
golang.org/x/text v0.3.3 // indirect
golang.org/x/tools v0.0.0-20191205225056-3393d29bb9fe // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,8 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392 h1:ACG4HJsFiNMf47Y4PeRoeb
golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152 h1:ZC1Xn5A1nlpSmQCIva4bZ3ob3lmhYIefc+GU+DLg1Ow=
golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA0mnthyA/nZ00AqCUo7vHg=
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
Expand Down
25 changes: 23 additions & 2 deletions vendor/golang.org/x/crypto/ssh/terminal/terminal.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/golang.org/x/crypto/ssh/terminal/util_windows.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ go.opentelemetry.io/otel/exporter/trace/jaeger
go.opentelemetry.io/otel/exporter/trace/jaeger/internal/gen-go/jaeger
# go.uber.org/atomic v1.4.0
go.uber.org/atomic
# golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152
# golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
golang.org/x/crypto/ssh/terminal
# golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271
golang.org/x/net/context
Expand Down

0 comments on commit 3d3ced1

Please sign in to comment.