[8.x] build(deps): bump github.com/elastic/apm-aggregation from 1.1.0 to 1.2.0 (backport #15056) #15059
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
…2.0 (#15056) * build(deps): bump github.com/elastic/apm-aggregation from 1.1.0 to 1.2.0 Bumps [github.com/elastic/apm-aggregation](https://github.com/elastic/apm-aggregation) from 1.1.0 to 1.2.0. - [Release notes](https://github.com/elastic/apm-aggregation/releases) - [Commits](elastic/apm-aggregation@v1.1.0...v1.2.0) --- updated-dependencies: - dependency-name: github.com/elastic/apm-aggregation dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] <support@github.com> 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 <99559985+kruskall@users.noreply.github.com> (cherry picked from commit d367e64) # Conflicts: # go.mod # go.sum
mergify
bot
added
backport
conflicts
|
Cherry-pick of d367e64 has failed: 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
approved these changes
Dec 27, 2024
kruskall
removed
the
conflicts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bumps github.com/elastic/apm-aggregation from 1.1.0 to 1.2.0.
Release notes
Sourced from github.com/elastic/apm-aggregation's releases.
Commits
e25bba7testing: expose convert and merge functions as part of public API (#233)ff9f9fbbuild(deps): bump google.golang.org/protobuf from 1.36.0 to 1.36.1 (#236)a6599e2build(deps): bump google.golang.org/protobuf from 1.35.2 to 1.36.0 (#232)b98a86cbuild(deps): bump the otel group with 5 updates (#231)0df725bbuild(deps): bump golang.org/x/tools in /tools in the dependencies group (#230)81af5a1build(deps): bump the golang-org-x group across 1 directory with 2 updates (#...878b285build(deps): bump github.com/stretchr/testify from 1.9.0 to 1.10.0 (#224)0a6c8abbuild(deps): bump google.golang.org/protobuf from 1.35.1 to 1.35.2 (#223)071da8cbuild(deps): bump golang.org/x/tools in /tools in the dependencies group (#222)3878da7build(deps): bump the otel group with 5 updates (#220)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 will merge this PR once it's up-to-date and CI passes on it, as requested by @lahsivjar.
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill 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 versionwill 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 dependencywill 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 #15056 done by [Mergify](https://mergify.com).