Skip to content

conflict: chore(deps): bump go.opentelemetry.io/otel/sdk from 1.34.0 to 1.40.0 (#2728) (f34a259)#391

Open
github-actions[bot] wants to merge 1 commit intomasterfrom
backport/f34a259-to-master
Open

conflict: chore(deps): bump go.opentelemetry.io/otel/sdk from 1.34.0 to 1.40.0 (#2728) (f34a259)#391
github-actions[bot] wants to merge 1 commit intomasterfrom
backport/f34a259-to-master

Conversation

@github-actions
Copy link
Contributor

⚠️ Backport With Conflicts

  • Upstream commit: apache/apisix-ingress-controller@f34a259
  • Original title: chore(deps): bump go.opentelemetry.io/otel/sdk from 1.34.0 to 1.40.0 (#2728)
  • Original author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

This PR contains unresolved conflicts. Please resolve them before merging.

Suggested workflow

  1. git fetch origin backport/f34a259-to-master
  2. git checkout backport/f34a259-to-master
  3. Resolve conflicts, commit, and push updates.

Created automatically by backport-bot.

…(#2728)

(cherry picked from commit f34a259fec42e9aa07edfe7dabf82a3ae45a01a6)
@github-actions github-actions bot added backport Automated backport automated Created by automation needs-manual-action Manual intervention required conflicts Contains merge conflicts labels Mar 12, 2026
@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automated Created by automation backport Automated backport conflicts Contains merge conflicts needs-manual-action Manual intervention required

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant