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.15](backport #5128) build: bump github.com/elastic/mock-es #5255

Merged
merged 2 commits into from
Aug 5, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 5, 2024

What does this PR do?

bump github.com/elastic/mock-es

Why is it important?

Split from #5120
Remove hard dependency on gofrs/uuid and unblock #5120

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

How to test this PR locally

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

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

* build: bump github.com/elastic/mock-es

* build: regenerate notice file

(cherry picked from commit 4331822)

# Conflicts:
#	go.sum
@mergify mergify bot requested a review from a team as a code owner August 5, 2024 10:26
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 5, 2024
@mergify mergify bot requested review from michalpristas and michel-laterman and removed request for a team August 5, 2024 10:26
Copy link
Contributor Author

mergify bot commented Aug 5, 2024

Cherry-pick of 4331822 has failed:

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

You are currently cherry-picking commit 433182208d.
  (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:   testing/integration/logs_ingestion_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   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

Copy link

@michalpristas michalpristas merged commit 1107d5f into 8.15 Aug 5, 2024
13 checks passed
@michalpristas michalpristas deleted the mergify/bp/8.15/pr-5128 branch August 5, 2024 15:33
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.

2 participants