Skip to content

Commit 85aa533

Browse files
authored
Merge branch 'main' into xav/go_modules/periph.io/x/periph-3.7.2
2 parents 057be29 + 29e8174 commit 85aa533

File tree

2 files changed

+47
-31
lines changed

2 files changed

+47
-31
lines changed

go.mod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/containers/image/v5 v5.19.3
99
github.com/docker/distribution v2.8.1+incompatible
1010
github.com/fatih/color v1.13.0
11-
github.com/go-logr/logr v1.2.2
11+
github.com/go-logr/logr v1.2.3
1212
github.com/go-redis/redis/v7 v7.4.1
1313
github.com/go-sql-driver/mysql v1.6.0
1414
github.com/gobwas/glob v0.2.3
@@ -34,7 +34,7 @@ require (
3434
github.com/spf13/viper v1.12.0
3535
github.com/stretchr/testify v1.8.0
3636
github.com/tj/go-spin v1.1.0
37-
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29
37+
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
3838
gopkg.in/yaml.v2 v2.4.0
3939
k8s.io/api v0.24.3
4040
k8s.io/apiextensions-apiserver v0.24.2
@@ -43,7 +43,7 @@ require (
4343
k8s.io/cli-runtime v0.24.3
4444
k8s.io/client-go v0.24.3
4545
k8s.io/klog/v2 v2.70.1
46-
oras.land/oras-go v1.1.1
46+
oras.land/oras-go v1.2.0
4747
sigs.k8s.io/controller-runtime v0.12.3
4848
)
4949

@@ -61,7 +61,7 @@ require (
6161
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
6262
github.com/BurntSushi/toml v1.0.0 // indirect
6363
github.com/Microsoft/go-winio v0.5.1 // indirect
64-
github.com/Microsoft/hcsshim v0.9.2 // indirect
64+
github.com/Microsoft/hcsshim v0.9.3 // indirect
6565
github.com/PuerkitoBio/purell v1.1.1 // indirect
6666
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
6767
github.com/aws/aws-sdk-go v1.34.9 // indirect
@@ -72,15 +72,15 @@ require (
7272
github.com/chzyer/logex v1.1.11-0.20160617073814-96a4d311aa9b // indirect
7373
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
7474
github.com/containerd/cgroups v1.0.3 // indirect
75-
github.com/containerd/containerd v1.6.3 // indirect
75+
github.com/containerd/containerd v1.6.6 // indirect
7676
github.com/containerd/stargz-snapshotter/estargz v0.11.0 // indirect
7777
github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b // indirect
7878
github.com/containers/ocicrypt v1.1.4 // indirect
7979
github.com/containers/storage v1.38.3 // indirect
8080
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
8181
github.com/davecgh/go-spew v1.1.1 // indirect
82-
github.com/docker/cli v20.10.11+incompatible // indirect
83-
github.com/docker/docker v20.10.14+incompatible // indirect
82+
github.com/docker/cli v20.10.17+incompatible // indirect
83+
github.com/docker/docker v20.10.17+incompatible // indirect
8484
github.com/docker/docker-credential-helpers v0.6.4 // indirect
8585
github.com/docker/go-connections v0.4.0 // indirect
8686
github.com/docker/go-metrics v0.0.1 // indirect
@@ -148,7 +148,7 @@ require (
148148
github.com/opencontainers/go-digest v1.0.0 // indirect
149149
github.com/opencontainers/runc v1.1.3 // indirect
150150
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
151-
github.com/opencontainers/selinux v1.10.0 // indirect
151+
github.com/opencontainers/selinux v1.10.1 // indirect
152152
github.com/ostreedev/ostree-go v0.0.0-20190702140239-759a8c1ac913 // indirect
153153
github.com/pelletier/go-toml v1.9.5 // indirect
154154
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
@@ -176,7 +176,7 @@ require (
176176
github.com/yusufpapurcu/wmi v1.2.2 // indirect
177177
go.opencensus.io v0.23.0 // indirect
178178
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
179-
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
179+
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
180180
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
181181
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
182182
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect

0 commit comments

Comments
 (0)