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.0](backport #29167) libbeat,packetbeat,x-pack/filebeat/input/netflow: unify gopacket dependencies #29283

Merged
merged 2 commits into from
Dec 6, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 6, 2021

This is an automatic backport of pull request #29167 done by Mergify.
Cherry-pick of c3d31a4 has failed:

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

You are currently cherry-picking commit c3d31a4f1.
  (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:   CHANGELOG.next.asciidoc
	modified:   NOTICE.txt
	modified:   go.mod
	modified:   libbeat/common/flowhash/communityid_test.go
	modified:   libbeat/common/seccomp/seccomp-profiler-allow.txt
	modified:   packetbeat/beater/worker.go
	modified:   packetbeat/decoder/decoder.go
	modified:   packetbeat/decoder/decoder_test.go
	modified:   packetbeat/decoder/util.go
	modified:   packetbeat/protos/icmp/icmp.go
	modified:   packetbeat/protos/icmp/icmp_test.go
	modified:   packetbeat/protos/icmp/message.go
	modified:   packetbeat/protos/icmp/message_test.go
	modified:   packetbeat/protos/icmp/transaction_test.go
	modified:   packetbeat/protos/tcp/tcp.go
	modified:   packetbeat/protos/tcp/tcp_test.go
	modified:   packetbeat/sniffer/afpacket_linux.go
	modified:   packetbeat/sniffer/afpacket_nonlinux.go
	modified:   packetbeat/sniffer/device.go
	modified:   packetbeat/sniffer/device_test.go
	modified:   packetbeat/sniffer/file.go
	modified:   packetbeat/sniffer/sniffer.go
	modified:   packetbeat/tests/system/test_0050_icmp.py
	modified:   x-pack/filebeat/input/netflow/netflow_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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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.com

…ndencies (#29167)

(cherry picked from commit c3d31a4)

# Conflicts:
#	go.sum
@mergify mergify bot requested a review from a team as a code owner December 6, 2021 09:25
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 6, 2021
@mergify mergify bot assigned efd6 Dec 6, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 6, 2021
@botelastic
Copy link

botelastic bot commented Dec 6, 2021

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 6, 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 preview

Expand to view the summary

Build stats

  • Start Time: 2021-12-06T10:01:49.862+0000

  • Duration: 225 min 39 sec

  • Commit: d655685

Test stats 🧪

Test Results
Failed 0
Passed 48313
Skipped 4288
Total 52601

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@efd6
Copy link
Contributor

efd6 commented Dec 6, 2021

/test

@efd6 efd6 merged commit 274ccac into 8.0 Dec 6, 2021
@efd6 efd6 deleted the mergify/bp/8.0/pr-29167 branch December 6, 2021 19:51
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 needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants