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.

Sign up for GitHub

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

Jump to bottom

[7.17](backport #35946) Updated protobuf to 1.29.1 #35957

Merged
merged 13 commits into from
Aug 28, 2023
Merged

[7.17](backport #35946) Updated protobuf to 1.29.1 #35957

merged 13 commits into from
Aug 28, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 29, 2023 •
edited by zube bot
Loading

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

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

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

@michalpristas @mergify
Updated protobuf to 1.29.1 (#35946)
5b6b63d 
(cherry picked from commit d37986c)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner June 29, 2023 11:53
@mergify mergify bot requested review from rdner and cmacknz and removed request for a team June 29, 2023 11:53
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 29, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 29, 2023
@botelastic
Copy link

botelastic bot commented Jun 29, 2023

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 29, 2023 •
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: 2023-08-28T12:48:54.184+0000

  • Duration: 138 min 58 sec

Test stats 🧪

Test Results
Failed 0
Passed 22455
Skipped 1426
Total 23881

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the 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!)

@mergify
Copy link
Contributor Author

mergify bot commented Jul 3, 2023

This pull request has not been merged yet. Could you please review and merge it @michalpristas? 🙏

@rdner
Copy link
Member

rdner commented Jul 3, 2023

/test

@rdner
Copy link
Member

rdner commented Jul 3, 2023

The snapshot image for E2E tests is missing:

Error response from daemon: No such image: docker.elastic.co/beats/filebeat:7.17.11-SNAPSHOT

@mergify
Copy link
Contributor Author

mergify bot commented Jul 10, 2023

This pull request has not been merged yet. Could you please review and merge it @michalpristas? 🙏

1 similar comment
@mergify
Copy link
Contributor Author

mergify bot commented Jul 17, 2023

This pull request has not been merged yet. Could you please review and merge it @michalpristas? 🙏

@michalpristas
Copy link
Contributor

/package

@mergify
Copy link
Contributor Author

mergify bot commented Jul 24, 2023

This pull request has not been merged yet. Could you please review and merge it @michalpristas? 🙏

@mergify
Copy link
Contributor Author

mergify bot commented Jul 31, 2023

This pull request has not been merged yet. Could you please review and merge it @michalpristas? 🙏

@mergify
Copy link
Contributor Author

mergify bot commented Aug 7, 2023

This pull request has not been merged yet. Could you please review and merge it @michalpristas? 🙏

@mergify
Copy link
Contributor Author

mergify bot commented Aug 14, 2023

This pull request has not been merged yet. Could you please review and merge it @michalpristas? 🙏

2 similar comments
@mergify
Copy link
Contributor Author

mergify bot commented Aug 21, 2023

This pull request has not been merged yet. Could you please review and merge it @michalpristas? 🙏

@mergify
Copy link
Contributor Author

mergify bot commented Aug 28, 2023

This pull request has not been merged yet. Could you please review and merge it @michalpristas? 🙏

@michalpristas michalpristas merged commit 5c2d524 into 7.17 Aug 28, 2023
5 checks passed
@michalpristas michalpristas deleted the mergify/bp/7.17/pr-35946 branch August 28, 2023 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rdner rdner Awaiting requested review from rdner rdner was automatically assigned from elastic/elastic-agent-data-plane

@cmacknz cmacknz Awaiting requested review from cmacknz cmacknz was automatically assigned from elastic/elastic-agent-data-plane

Assignees

@michalpristas michalpristas

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 @rdner @michalpristas