[AUTO-CHERRYPICK] [CRITICAL] Patch etcd for CVE-2026-39821 - branch 3.0-dev#17564
Merged
Merged
Conversation
Co-authored-by: AkarshHCL <v-akarshc@microsoft.com> Co-authored-by: Sumit Jena <v-sumitjena@microsoft.com> (cherry picked from commit a4f5fae)
CBL-Mariner-Bot
added
the
Auto Fast-track Cherry-pick
Collaborator
Author
Auto Cherry-Pick SPEC Validation Summary
|
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 3.5.30 | 3.5.30 | 3.5.30 |
| Release | 2 | 1 | 2 |
| Patches | 3 | 1 | 3 |
| Conflict | Yes |
- Version-release 3.5.30-2 is not higher than Source 3.5.30-2
- Unresolved conflict markers (<<<<<<< / >>>>>>>) found in file
- Duplicate changelog entry for 3.5.28-2 (appears 2 times)
- Changelog out of order: 3.5.28-2 appears before 3.5.30-1
12 tasks
microsoft-github-policy-service
Bot
added
Packaging
Automatic PR
3.0-dev
jslobodzian
approved these changes
May 30, 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 a4f5fae to 3.0-dev. Original PR: #17529
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.