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

[8.x](backport #6271) build(deps): bump github.com/elastic/go-docappender/v2 from 2.3.1 to 2.3.2 #6307

Merged
merged 2 commits into from
Dec 30, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 12, 2024

Bumps github.com/elastic/go-docappender/v2 from 2.3.1 to 2.3.2.

Release notes

Sourced from github.com/elastic/go-docappender/v2's releases.

v2.3.2

What's Changed

Full Changelog: elastic/go-docappender@v2.3.1...v2.3.2

Commits
  • 5ab7a94 add metric: docappender.blocked.add counter (#219)
  • d7a82ed build(deps): bump golang.org/x/sync from 0.9.0 to 0.10.0 (#218)
  • f8b381e build(deps): bump github.com/stretchr/testify in /integrationtest (#217)
  • 6e8e423 build(deps): bump github.com/stretchr/testify from 1.9.0 to 1.10.0 (#216)
  • See full diff in compare view

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

…2.3.2 (#6271)

* build(deps): bump github.com/elastic/go-docappender/v2

Bumps [github.com/elastic/go-docappender/v2](https://github.com/elastic/go-docappender) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/elastic/go-docappender/releases)
- [Commits](elastic/go-docappender@v2.3.1...v2.3.2)

---
updated-dependencies:
- dependency-name: github.com/elastic/go-docappender/v2
  dependency-type: indirect
  update-type: version-update:semver-patch
...

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: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 5946029)

# Conflicts:
#	go.mod
@mergify mergify bot requested a review from a team as a code owner December 12, 2024 14:55
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 12, 2024
@mergify mergify bot requested review from michalpristas and blakerouse and removed request for a team December 12, 2024 14:55
Copy link
Contributor Author

mergify bot commented Dec 12, 2024

Cherry-pick of 5946029 has failed:

On branch mergify/bp/8.x/pr-6271
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit 59460297b2.
  (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.sum

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

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

Copy link
Contributor Author

mergify bot commented Dec 30, 2024

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/8.x/pr-6271 upstream/mergify/bp/8.x/pr-6271
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-6271

@jlind23 jlind23 merged commit 808f803 into 8.x Dec 30, 2024
7 checks passed
@jlind23 jlind23 deleted the mergify/bp/8.x/pr-6271 branch December 30, 2024 13:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant