Skip to content

[7.15](backport #28094) [Metricbeat] upgrade flatbuffers to 1.12.1#28834

Merged
mtojek merged 1 commit into7.15from
mergify/bp/7.15/pr-28094
Nov 8, 2021
Merged

[7.15](backport #28094) [Metricbeat] upgrade flatbuffers to 1.12.1#28834
mtojek merged 1 commit into7.15from
mergify/bp/7.15/pr-28094

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Nov 5, 2021 •
edited by zube bot
Loading

This is an automatic backport of pull request #28094 done by Mergify.
Cherry-pick of 5ee1964 has failed:

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

You are currently cherry-picking commit 5ee1964c64.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 5, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 5, 2021
@botelastic
Copy link
Copy Markdown

botelastic bot commented Nov 5, 2021

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

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Nov 5, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 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-11-05T09:36:42.751+0000

  • Duration: 206 min 48 sec

  • Commit: ebff6b2

Test stats 🧪

Test Results
Failed 0
Passed 53174
Skipped 5289
Total 58463

💚 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.

@endorama
[Metricbeat] upgrade flatbuffers to 1.12.1 (#28094)
ebff6b2 
(cherry picked from commit 5ee1964)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@endorama endorama force-pushed the mergify/bp/7.15/pr-28094 branch from 85b684c to ebff6b2 Compare November 5, 2021 09:36
@mtojek mtojek self-requested a review November 8, 2021 09:48
@mtojek mtojek merged commit 953be4c into 7.15 Nov 8, 2021
@mergify mergify bot deleted the mergify/bp/7.15/pr-28094 branch November 8, 2021 09:58
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@mergify @endorama
[Metricbeat] upgrade flatbuffers to 1.12.1 (elastic#28094) (elastic#2…
b2b1105 
…8834)

(cherry picked from commit 251fc0b)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum

Co-authored-by: endorama <526307+endorama@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@mtojek mtojek mtojek approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@endorama endorama

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@elasticmachine @mtojek @endorama