[AUTO-CHERRYPICK] Upgrade thrift module in vendor tarball of telegraf - branch 3.0-dev - #18357
Merged
Merged
Conversation
azurelinux-ci-jwt-app
Bot
added
the
Auto Fast-track Cherry-pick
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
microsoft-github-policy-service
Bot
added
Packaging
3.0-dev
Author
|
All conflicts resolved. |
Author
Auto Cherry-Pick SPEC Validation Summary
|
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 1.31.0 | 1.31.0 | None |
| Release | 26 | 27 | 28 |
| Patches | 53 | 56 | 53 |
| Conflict | Yes |
- Version-release None-28 is not higher than Source 1.31.0-26
- Version-release None-28 is not higher than Target 1.31.0-27
- Duplicate changelog entry for 1.31.0-23 (appears 2 times)
- Duplicate changelog entry for 1.31.0-22 (appears 2 times)
- Changelog out of order: 1.31.0-22 appears before 1.31.0-24
- Directive present in both Source and Target was dropped: Source0: %{url}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Restore the complete 3.0-dev spec and re-sequence its unpublished changelog entries above the canonical Fast-Track thrift update. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: b5782df8-5e99-4743-821c-f9fc35389220
Correct the AI conflict resolver output so the changelog for the thrift upgrade (fasttrack -26) cherry-pick matches the actual sequence of patches applied on 3.0-dev: - Kanishk's thrift upgrade correctly stays at -26 (slotted after the shipped -25 to preserve fasttrack lineage). - Jyoti's CVE-2025-29923/CVE-2025-46327 (Patch54, Patch55) bumps from -26 to -27, keeping the original Thu Jul 30 2026 date. - Security Servicing Account's CVE-2026-54908 (Patch56, applied last) bumps from -27 to -28 and stays on top, keeping the original Thu Jul 30 2026 date. Patch numbers already increase in changelog-newest-to-oldest order, so no Patch renumbering is required.
Kanishk's thrift upgrade at -26 is dated Aug 03. The two entries above it (which were originally Jul 30 on 3.0-dev before renumbering) need to move forward to Aug 07 so the changelog stays monotonically non-decreasing in date from bottom to top.
Collaborator
|
/azurepipelines run |
|
Azure Pipelines: Successfully started running 1 pipeline(s). 1 pipeline(s) were filtered out due to trigger conditions. |
Pawel Winogrodzki (PawelWMS)
approved these changes
Aug 7, 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 883179e to 3.0-dev. Original PR: #18291
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.