Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump github.com/elastic/apm-data to 1.11.0 (backport #13950) #14003

Merged
merged 6 commits into from
Sep 24, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 6, 2024

Bumps github.com/elastic/apm-data from 1.10.0 to 1.11.0.

Release notes

Sourced from github.com/elastic/apm-data's releases.

v1.11.0

What's Changed

New Contributors

Full Changelog: elastic/apm-data@v1.10.0...v1.11.0

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 #13950 done by [Mergify](https://mergify.com).

…13950)

* build(deps): bump github.com/elastic/apm-data from 1.10.0 to 1.11.0

Bumps [github.com/elastic/apm-data](https://github.com/elastic/apm-data) from 1.10.0 to 1.11.0.
- [Release notes](https://github.com/elastic/apm-data/releases)
- [Commits](elastic/apm-data@v1.10.0...v1.11.0)

---
updated-dependencies:
- dependency-name: github.com/elastic/apm-data
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* Update NOTICE.txt

---------

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

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner September 6, 2024 11:00
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Sep 6, 2024
Copy link
Contributor Author

mergify bot commented Sep 6, 2024

Cherry-pick of cf4a4b4 has failed:

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

You are currently cherry-picking commit cf4a4b424.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

no changes added to commit (use "git add" and/or "git commit -a")

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

@kruskall kruskall changed the title build(deps): bump github.com/elastic/apm-data from 1.10.0 to 1.11.0 (backport #13950) build(deps): bump github.com/elastic/apm-data to 1.11.0 (backport #13950) Sep 6, 2024
Copy link
Contributor Author

mergify bot commented Sep 9, 2024

This pull request has not been merged yet. Could you please review and merge it @? 🙏

Copy link
Contributor Author

mergify bot commented Sep 16, 2024

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.15/pr-13950 upstream/mergify/bp/8.15/pr-13950
git merge upstream/8.15
git push upstream mergify/bp/8.15/pr-13950

Copy link
Contributor Author

mergify bot commented Sep 16, 2024

This pull request has not been merged yet. Could you please review and merge it @? 🙏

1 similar comment
Copy link
Contributor Author

mergify bot commented Sep 23, 2024

This pull request has not been merged yet. Could you please review and merge it @? 🙏

@kruskall
Copy link
Member

Note: the issue description is based on the PR on main and it's misleading.

The actual commit diff is elastic/apm-data@v1.9.1...v1.11.0

@kruskall kruskall removed the conflicts There is a conflict in the backported pull request label Sep 23, 2024
@kruskall
Copy link
Member

@Mergifyio queue

Copy link
Contributor Author

mergify bot commented Sep 24, 2024

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 8ff79c0

@mergify mergify bot merged commit 8ff79c0 into 8.15 Sep 24, 2024
11 checks passed
@mergify mergify bot deleted the mergify/bp/8.15/pr-13950 branch September 24, 2024 10:34
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.

3 participants