Merge upstream/release-5.29 into main #2272
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
... to avoid breakage on incompatible dependency updates, like https://cirrus-ci.com/build/5613830407979008 . Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Use a stable Skopeo branch for testing the stable c/image branch
Backport the fix from main for containers#2260 to allow for the lastest Docker Daemons to work with c/image. Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
As the title says. Bumping to 5.29.2 to get the Docker Daemon Fix in. [NO NEW TESTS NEEDED] Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
As the title says. Bumping to v5.29.3-dev for further development. [NO NEW TESTS NEEDED] Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
…/ddaemon Backport Docker Daemon fix containers#2260, bump to 5.29.2, then 5.29.3-dev
... so that Go understands future commits from main are a superset of currrent release-5.29, and does not attempt to downgrade users of main to the released 5.29.2 tag. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
... so that Go understands future commits from
mainare a superset of currrentrelease-5.29, and does not attempt to downgrade users ofmainto the released5.29.2tag.