Skip to content

Merge 8 upstream commits (up to lock file maintenance #1251)#253

Merged
gnurizen merged 9 commits intomainfrom
upstream-merge
Apr 14, 2026
Merged

Merge 8 upstream commits (up to lock file maintenance #1251)#253
gnurizen merged 9 commits intomainfrom
upstream-merge

Conversation

@gnurizen
Copy link
Copy Markdown
Collaborator

Summary

Upstream commits included

Stopped before

534ce0d3 fix(deps): update go dependencies (open-telemetry#1250) — breaks test compilation due to testcontainers-go nat.Portnetwork.Port type change. Needs a follow-up fix commit.

Test plan

  • CI passes on this PR
  • Verify no regressions in existing carry patches

Generated by tools/upstream-merge.sh

renovate Bot and others added 9 commits March 12, 2026 09:21
…1247)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…telemetry#1246)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Roger Coll <roger.coll@elastic.co>
Co-authored-by: Florian Lehner <florianl@users.noreply.github.com>
Co-authored-by: Christos Kalkanis <christos.kalkanis@elastic.co>
Signed-off-by: Florian Lehner <florian.lehner@elastic.co>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@CLAassistant
Copy link
Copy Markdown

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 5 committers have signed the CLA.

✅ gnurizen
❌ wehzzz
❌ fabled
❌ NimrodAvni78
❌ florianl
You have signed the CLA already but the status is still pending? Let us recheck it.

@gnurizen gnurizen marked this pull request as draft April 14, 2026 15:12
@gnurizen gnurizen marked this pull request as ready for review April 14, 2026 17:44
@gnurizen gnurizen requested a review from brancz April 14, 2026 17:44
@gnurizen gnurizen merged commit c4a85f8 into main Apr 14, 2026
99 of 103 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants