Closed mergify[bot] closed 3 weeks ago
Cherry-pick of 8d390f8d1c9d39f64b1d97c500beda912bfbecf3 has failed:
On branch mergify/bp/8.x/pr-4072
Your branch is up to date with 'origin/8.x'.
You are currently cherry-picking commit 8d390f8.
(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.txt
modified: go.mod
modified: go.sum
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: testing/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
This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏 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/8.x/pr-4072 upstream/mergify/bp/8.x/pr-4072
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-4072
@Mergifyio rebase
rebase
Issues
0 New issues
0 Fixed issues
0 Accepted issues
Measures
0 Security Hotspots
No data about Coverage
No data about Duplication
Bumps github.com/elastic/go-sysinfo from 1.14.2 to 1.15.0.
Release notes
Sourced from github.com/elastic/go-sysinfo's releases.
Commits
750e2c7
Fetch all ip addresses in a single stdlib call (#246)b4a498b
ci: use macos-15 and remove macos-12 (#245)323c852
Bump vmactions/freebsd-vm from 1.1.3 to 1.1.4 in the github-actions group (#244)d6059b3
Revert "github-action: enable opentelemetry for tracing GitHub actions" (#243)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
This is an automatic backport of pull request #4072 done by [Mergify](https://mergify.com).