[AUTO-CHERRYPICK] [AUTO-PR] azure-core/azurelinux:hebeberm/fasttrack/3.0/containerd2 - branch 3.0-dev#17767
Open
CBL-Mariner-Bot wants to merge 3 commits into
Open
[AUTO-CHERRYPICK] [AUTO-PR] azure-core/azurelinux:hebeberm/fasttrack/3.0/containerd2 - branch 3.0-dev#17767CBL-Mariner-Bot wants to merge 3 commits into
CBL-Mariner-Bot wants to merge 3 commits into
Conversation
CBL-Mariner-Bot
added
the
Auto Fast-track Cherry-pick
microsoft-github-policy-service
Bot
added
Packaging
3.0-dev
Collaborator
Author
|
All conflicts resolved. |
Collaborator
Author
Auto Cherry-Pick SPEC Validation Summary
|
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 2.2.4 | 2.2.4 | 2.2.4 |
| Release | 3 | 3 | 4 |
| Patches | 13 | 11 | 16 |
| Conflict | Yes |
- Duplicate changelog entry for 2.1.6-4 (appears 2 times)
- Duplicate changelog entry for 2.1.6-3 (appears 2 times)
- Changelog out of order: 2.1.6-3 appears before 2.2.4-1
Collaborator
|
/azurepipelines run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Restore %{?systemd_requires} and %dir /opt/containerd/lib that the auto-merge silently dropped -- both lines are present in fasttrack/3.0 and 3.0-dev source branches.
Remove fabricated '- Patch for CVE-2026-33814' bullet from the 2.2.4-2 changelog entry (not present in either source branch).
Remove duplicate 2.1.6-4 and 2.1.6-3 changelog blocks that the auto-merge inserted between 2.2.4-2 and 2.2.4-1. The originals remain in their correct position after the 2.1.6-5 entry.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
anphel31
approved these changes
Jun 26, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This is an auto-generated pull request to cherry-pick commit 5da94e0 to 3.0-dev. Original PR: #17764
In case of no merge conflicts, the PR is merged without approval because it's an automated cherry-pick of an already approved PR.
In case of merge conflicts, an AI-based conflict resolver will attempt to resolve conflicts and might make mistakes. The reviewer must check AI's work before approving.