Skip to content

[7.x](backport #27717) Update Sarama to 1.29.1#27752

Merged
faec merged 4 commits into7.xfrom
mergify/bp/7.x/pr-27717
Sep 10, 2021
Merged

[7.x](backport #27717) Update Sarama to 1.29.1#27752
faec merged 4 commits into7.xfrom
mergify/bp/7.x/pr-27717

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Sep 3, 2021 •
edited by zube bot
Loading

This is an automatic backport of pull request #27717 done by Mergify.
Cherry-pick of 29da912 has failed:

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

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

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.io/

@faec
Update Sarama to 1.29.1 (#27717)
ed6790f 
(cherry picked from commit 29da912)

# Conflicts:
#	go.sum
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 3, 2021
@mergify mergify bot assigned faec Sep 3, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 3, 2021
@botelastic
Copy link
Copy Markdown

botelastic bot commented Sep 3, 2021

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

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Sep 3, 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-09-09T16:55:49.313+0000

  • Duration: 238 min 27 sec

  • Commit: f0c8351

Test stats 🧪

Test Results
Failed 0
Passed 53307
Skipped 5268
Total 58575

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 53307
Skipped 5268
Total 58575

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Sep 7, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.x/pr-27717 upstream/mergify/bp/7.x/pr-27717
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-27717

@faec
Copy link
Copy Markdown
Contributor

faec commented Sep 9, 2021

jenkins run the tests

@faec faec merged commit dad8b5b into 7.x Sep 10, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-27717 branch September 10, 2021 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@faec faec

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.

2 participants

@elasticmachine @faec