Skip to content

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

Closed
github-actions[bot] wants to merge 1 commit into
masterfrom
backport/f34a259-to-master
Closed

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 into
masterfrom
backport/f34a259-to-master

Conversation

@github-actions

Copy link
Copy Markdown
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.

@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
Copy Markdown

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.

@AlinsRan

AlinsRan commented Sep 3, 2026

Copy link
Copy Markdown
Contributor

Closing as part of removing the auto-backport workflow (#469).

This PR was opened by the auto-backport bot, which has been broken since 2026-03-13 and is being deleted. The change here is either not applicable to this repo (upstream release chores, dependency bumps, upstream-only docs) or has already landed here through a manual backport. Upstream changes are now backported per PR by hand using the (backport apache/apisix-ingress-controller#NNNN) convention; if this one is still wanted, open a fresh PR that way.

@AlinsRan AlinsRan closed this Sep 3, 2026
@AlinsRan
AlinsRan deleted the backport/f34a259-to-master branch September 3, 2026 05:45
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.

2 participants