Skip to content

Commit 4aef5a2

Browse files
authored
Merge branch 'master' into update-coredns
2 parents c950579 + 43df380 commit 4aef5a2

File tree

740 files changed

+68577
-17656
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

740 files changed

+68577
-17656
lines changed

go.mod

+10-12
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ require (
77
github.com/coredns/coredns v1.9.3
88
github.com/coreos/go-iptables v0.6.0
99
github.com/vishvananda/netlink v1.1.0
10-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a
10+
golang.org/x/sys v0.18.0
1111
)
1212

1313
require (
1414
github.com/apparentlymart/go-cidr v1.1.0 // indirect
1515
github.com/beorn7/perks v1.0.1 // indirect
16-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
16+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
1717
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
18-
github.com/golang/protobuf v1.5.2 // indirect
18+
github.com/golang/protobuf v1.5.3 // indirect
1919
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
2020
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
2121
github.com/miekg/dns v1.1.49 // indirect
@@ -26,13 +26,11 @@ require (
2626
github.com/prometheus/procfs v0.7.3 // indirect
2727
github.com/stretchr/testify v1.7.1 // indirect
2828
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
29-
golang.org/x/mod v0.4.2 // indirect
30-
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
31-
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect
32-
golang.org/x/text v0.3.7 // indirect
33-
golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2 // indirect
34-
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
35-
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
36-
google.golang.org/grpc v1.46.2 // indirect
37-
google.golang.org/protobuf v1.28.0 // indirect
29+
golang.org/x/mod v0.8.0 // indirect
30+
golang.org/x/net v0.23.0 // indirect
31+
golang.org/x/text v0.14.0 // indirect
32+
golang.org/x/tools v0.6.0 // indirect
33+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
34+
google.golang.org/grpc v1.56.3 // indirect
35+
google.golang.org/protobuf v1.33.0 // indirect
3836
)

go.sum

+917-13
Large diffs are not rendered by default.

vendor/github.com/cespare/xxhash/v2/README.md

+17-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cespare/xxhash/v2/testall.sh

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cespare/xxhash/v2/xxhash.go

+20-27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)