Skip to content

Conversation

@CBL-Mariner-Bot
Copy link
Collaborator

This is an auto-generated pull request to cherry-pick commit 46e52ca to 3.0-dev. Original PR: #15123
In case of no merge conflicts, the PR is merged without approval because it's an automated cherry-pick of an already approved PR.

@CBL-Mariner-Bot CBL-Mariner-Bot added the Auto Fast-track Cherry-pick Automatic cherry-pick from fast-track branch label Nov 19, 2025
@CBL-Mariner-Bot CBL-Mariner-Bot marked this pull request as ready for review November 19, 2025 19:47
@CBL-Mariner-Bot
Copy link
Collaborator Author

All conflicts resolved.

Merging changes between 3.0-dev and fasttrack/3.0.  3.0-dev branch has moved to version 1.5.3 and we just released a 1.5.0-6 version from fasttrack/3.0.  This change reconciles the differences without removing the patch file.  A subsequent change may be needed to remove the patch file as well.
Copy link
Contributor

@Kanishk-Bansal Kanishk-Bansal left a comment

Choose a reason for hiding this comment

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

Looks good to me.
The dates were updated to ensure the changelog chronology is accurate.

@jslobodzian jslobodzian merged commit 1855b5b into 3.0-dev Nov 25, 2025
20 of 24 checks passed
@jslobodzian jslobodzian deleted the cblmargh/cherry-pick-pr-15123-to-3.0-dev branch November 25, 2025 15:59
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.

5 participants