Skip to content

[AUTO-CHERRYPICK] [AutoPR- Security] Patch containerized-data-importer for CVE-2026-35469 [HIGH] - branch 3.0-dev#17238

Merged
jslobodzian merged 2 commits into
3.0-devfrom
cblmargh/cherry-pick-pr-17053-to-3.0-dev
May 21, 2026
Merged

[AUTO-CHERRYPICK] [AutoPR- Security] Patch containerized-data-importer for CVE-2026-35469 [HIGH] - branch 3.0-dev#17238
jslobodzian merged 2 commits into
3.0-devfrom
cblmargh/cherry-pick-pr-17053-to-3.0-dev

Conversation

@CBL-Mariner-Bot
Copy link
Copy Markdown
Collaborator

This is an auto-generated pull request to cherry-pick commit 5ddf5da to 3.0-dev. Original PR: #17053
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.

… [HIGH] (#17053)

Co-authored-by: Aditya Singh <v-aditysing@microsoft.com>
(cherry picked from commit 5ddf5da)
- Resolve conflict markers in Patch and changelog sections.
- Swap Patch7/Patch8 so fasttrack's CVE-2026-35469 (published) keeps
  the lower slot and 3.0-dev's CVE-2026-33814 is sequenced after.
- Bump Release to 5 (both branches were at 4 with different content).
- Reorder changelog: -5 (3.0-dev, renumbered) on top, -4 (fasttrack,
  original) below — strictly descending.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@jslobodzian jslobodzian marked this pull request as ready for review May 21, 2026 16:48
@jslobodzian jslobodzian requested a review from a team as a code owner May 21, 2026 16:48
@jslobodzian jslobodzian merged commit ad95ff2 into 3.0-dev May 21, 2026
26 of 31 checks passed
@jslobodzian jslobodzian deleted the cblmargh/cherry-pick-pr-17053-to-3.0-dev branch May 21, 2026 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3.0-dev PRs Destined for AzureLinux 3.0 Auto Fast-track Cherry-pick Automatic cherry-pick from fast-track branch Automatic PR Packaging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants