Skip to content

Commit 6c91a3d

Browse files
authored
Merge pull request #397 from TomSweeneyRedHat/dev/tsweeney_5.7.1_dance
image to v5.38.0 and vendor storage v1.61.0 into it.
2 parents 3e470be + 8cf3807 commit 6c91a3d

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

image/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ require (
3636
github.com/ulikunitz/xz v0.5.15
3737
github.com/vbauerster/mpb/v8 v8.10.2
3838
go.etcd.io/bbolt v1.4.3
39-
go.podman.io/storage v1.60.0
39+
go.podman.io/storage v1.61.0
4040
golang.org/x/crypto v0.43.0
4141
golang.org/x/oauth2 v0.32.0
4242
golang.org/x/sync v0.17.0

image/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,8 @@ go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKr
300300
go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
301301
go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
302302
go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
303-
go.podman.io/storage v1.60.0 h1:bWNSrR58nxg39VNFDSx3m0AswbvyzPGOo5XsUfomTao=
304-
go.podman.io/storage v1.60.0/go.mod h1:NK+rsWJVuQeCM7ifv7cxD3abegWxwtW/3OkuSUJJoE4=
303+
go.podman.io/storage v1.61.0 h1:5hD/oyRYt1f1gxgvect+8syZBQhGhV28dCw2+CZpx0Q=
304+
go.podman.io/storage v1.61.0/go.mod h1:A3UBK0XypjNZ6pghRhuxg62+2NIm5lcUGv/7XyMhMUI=
305305
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
306306
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
307307
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=

image/version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const (
1111
VersionPatch = 0
1212

1313
// VersionDev indicates development branch. Releases will be empty string.
14-
VersionDev = "-dev"
14+
VersionDev = ""
1515
)
1616

1717
// Version is the specification version that the package types support.

0 commit comments

Comments
 (0)