Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 22, 2025

Bumps github.com/elastic/elastic-agent-libs from 0.26.1 to 0.26.2.

Release notes

Sourced from github.com/elastic/elastic-agent-libs's releases.

v0.26.2

What's Changed

Full Changelog: elastic/elastic-agent-libs@v0.26.1...v0.26.2

Commits

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

This is an automatic backport of pull request #11353 done by [Mergify](https://mergify.com).

…o 0.26.2 (#11353)

* build(deps): bump github.com/elastic/elastic-agent-libs

Bumps [github.com/elastic/elastic-agent-libs](https://github.com/elastic/elastic-agent-libs) from 0.26.1 to 0.26.2.
- [Release notes](https://github.com/elastic/elastic-agent-libs/releases)
- [Commits](elastic/elastic-agent-libs@v0.26.1...v0.26.2)

---
updated-dependencies:
- dependency-name: github.com/elastic/elastic-agent-libs
  dependency-version: 0.26.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update EDOT go.mod

* Update NOTICE.txt and/or NOTICE-fips.txt

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 9c0f97c)

# Conflicts:
#	go.mod
#	internal/edot/go.mod
#	internal/edot/go.sum
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 22, 2025
@mergify mergify bot requested a review from a team as a code owner November 22, 2025 15:27
@mergify
Copy link
Contributor Author

mergify bot commented Nov 22, 2025

Cherry-pick of 9c0f97c has failed:

On branch mergify/bp/9.1/pr-11353
Your branch is up to date with 'origin/9.1'.

You are currently cherry-picking commit 9c0f97ce2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   NOTICE-fips.txt
	modified:   NOTICE.txt
	modified:   go.sum

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   go.mod
	deleted by us:   internal/edot/go.mod
	deleted by us:   internal/edot/go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested review from blakerouse and michel-laterman and removed request for a team November 22, 2025 15:27
@mergify mergify bot added conflicts There is a conflict in the backported pull request backport labels Nov 22, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@elasticmachine
Copy link
Contributor

💔 Build Failed

Failed CI Steps

History

@mergify
Copy link
Contributor Author

mergify bot commented Dec 1, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/9.1/pr-11353 upstream/mergify/bp/9.1/pr-11353
git merge upstream/9.1
git push upstream mergify/bp/9.1/pr-11353

@mergify mergify bot closed this Dec 1, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Dec 1, 2025

This pull request has been automatically closed by Mergify.
There are some other up-to-date pull requests.

@mergify mergify bot deleted the mergify/bp/9.1/pr-11353 branch December 1, 2025 18:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automation backport conflicts There is a conflict in the backported pull request skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants