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

[release-1.14] Align the dep of sarama to same as main #3911

Merged

Conversation

matzew
Copy link
Contributor

@matzew matzew commented May 29, 2024

Fixes #

Proposed Changes

  • update to a newer sarama version, containing bug fixes

Release Note


Docs

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
@knative-prow knative-prow bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 29, 2024
Copy link
Contributor

@creydr creydr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix @matzew

/lgtm

@knative-prow knative-prow bot added the lgtm Indicates that a PR is ready to be merged. label May 29, 2024
Copy link

knative-prow bot commented May 29, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: creydr, matzew

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@creydr
Copy link
Contributor

creydr commented May 29, 2024

@fos1be: fyi regarding #3909

@pierDipi
Copy link
Member

/test reconciler-tests

@knative-prow knative-prow bot merged commit 976b325 into knative-extensions:release-1.14 May 29, 2024
33 of 34 checks passed
@matzew
Copy link
Contributor Author

matzew commented May 29, 2024

/cherry-pick release-1.13

@knative-prow-robot
Copy link
Contributor

@matzew: #3911 failed to apply on top of branch "release-1.13":

Applying: lipstick: Align the dep of sarama to same as main
.git/rebase-apply/patch:1874: trailing whitespace.
  
.git/rebase-apply/patch:1910: trailing whitespace.
   
.git/rebase-apply/patch:1924: trailing whitespace.
	
.git/rebase-apply/patch:4981: trailing whitespace.
	crStateReading 
error: patch failed: vendor/github.com/klauspost/compress/README.md:16
error: vendor/github.com/klauspost/compress/README.md: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Patch failed at 0001 lipstick: Align the dep of sarama to same as main
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants