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

[7.x] Update to elastic/beats@2871d29be93a (backport #5454) #5589

Merged
merged 4 commits into from
Jun 30, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 30, 2021

This is an automatic backport of pull request #5454 done by Mergify.
Cherry-pick of 1860de4 has failed:

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

You are currently cherry-picking commit 1860de4b.
  (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:   .go-version
	modified:   Dockerfile
	modified:   README.md
	modified:   tests/Dockerfile

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   NOTICE.txt
	deleted by us:   changelogs/head.asciidoc
	both modified:   docs/version.asciidoc
	both modified:   go.mod
	both modified:   go.sum
	both modified:   include/fields.go

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

* Update to elastic/beats@2871d29be93a

* upgrade go version to 1.15.6

related to #5374

(cherry picked from commit 1860de4)

# Conflicts:
#	NOTICE.txt
#	changelogs/head.asciidoc
#	docs/version.asciidoc
#	go.mod
#	go.sum
#	include/fields.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 30, 2021
@mergify mergify bot assigned simitt Jun 30, 2021
@apmmachine
Copy link
Contributor

apmmachine commented Jun 30, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #5589 updated

  • Start Time: 2021-06-30T13:22:13.874+0000

  • Duration: 37 min 50 sec

  • Commit: 1bb8013

Test stats 🧪

Test Results
Failed 0
Passed 4661
Skipped 105
Total 4766

Trends 🧪

Image of Build Times

Image of Tests

@stuartnelson3 stuartnelson3 merged commit 4269aee into 7.x Jun 30, 2021
@stuartnelson3 stuartnelson3 deleted the mergify/bp/7.x/pr-5454 branch June 30, 2021 14:10
simitt added a commit to simitt/apm-server that referenced this pull request Jun 30, 2021
axw added a commit that referenced this pull request Jul 1, 2021
* Revert "[7.x] Update to elastic/beats@2871d29be93a (backport #5454) (#5589)"

This reverts commit 4269aee.

* Update go version to 1.16.5

* Update to elastic/beats@9361be46ebf2

* update tests to new ecs version

* fix broken test due to elastic/beats#25219

* update python tests to new ecs version

* make update

Co-authored-by: Andrew Wilkins <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants