Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: bump docker API to 1.45 [backport: release/v0.52] #6922

Merged
merged 2 commits into from
Jun 13, 2024

Conversation

aqua-bot
Copy link
Contributor

Backport

This will backport the following commits from main to release/v0.52:

⚠️ Warning

Conflicts occurred during the cherry-pick and were force-committed without proper resolution. Please carefully review the changes, resolve any remaining conflicts, and ensure the code is in a valid state.

@aqua-bot aqua-bot added the backport Backport PRs label Jun 13, 2024
@aqua-bot aqua-bot mentioned this pull request Jun 13, 2024
7 tasks
Copy link
Contributor

@DmitriyLewen DmitriyLewen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

conflict was resolved in d6b64f0

@DmitriyLewen DmitriyLewen added this pull request to the merge queue Jun 13, 2024
Merged via the queue into release/v0.52 with commit 191d31e Jun 13, 2024
12 checks passed
@DmitriyLewen DmitriyLewen deleted the backport-pr-6914-to-release/v0.52 branch June 13, 2024 10:22
@knqyf263
Copy link
Collaborator

I never expected conflicts to occur so frequently. It was worthwhile to create the backport tool myself.

@DmitriyLewen
Copy link
Contributor

It looks like we'll see the most conflicts with the go.mod/go.sum files.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Backport PRs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants