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

Bump Sarama to v1.30.0 #1435

Conversation

pierDipi
Copy link
Member

@pierDipi pierDipi commented Nov 8, 2021

Proposed Changes

  • Bump Sarama to v1.30.0

Release Note

None

Docs

None

Signed-off-by: Pierangelo Di Pilato <pdipilat@redhat.com>
@google-cla google-cla bot added the cla: yes Indicates the PR's author has signed the CLA. label Nov 8, 2021
@knative-prow-robot knative-prow-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. area/control-plane labels Nov 8, 2021
@codecov
Copy link

codecov bot commented Nov 8, 2021

Codecov Report

Merging #1435 (7888f70) into main (d3815d2) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##               main    #1435   +/-   ##
=========================================
  Coverage     71.41%   71.41%           
  Complexity      584      584           
=========================================
  Files           100      100           
  Lines          3964     3964           
  Branches        166      166           
=========================================
  Hits           2831     2831           
  Misses          915      915           
  Partials        218      218           
Flag Coverage Δ
java-unittests 82.28% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.


Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d3815d2...7888f70. Read the comment docs.

@knative-prow-robot knative-prow-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 8, 2021
@knative-prow-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: odacremolbap, pierDipi

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

@knative-prow-robot knative-prow-robot merged commit 31c9537 into knative-extensions:main Nov 8, 2021
@matzew
Copy link
Contributor

matzew commented Nov 23, 2021

/cherry-pick release-0.26

@knative-prow-robot
Copy link
Contributor

@matzew: #1435 failed to apply on top of branch "release-0.26":

Applying: Bump Sarama to v1.30.0
.git/rebase-apply/patch:4253: trailing whitespace.
* Aug 3, 2021 (v1.13.3) 
.git/rebase-apply/patch:4275: trailing whitespace.
	* zstd: Forward read errors [#373](https://github.com/klauspost/compress/pull/373) 
.git/rebase-apply/patch:4283: trailing whitespace.
	* s2sx: Limit max executable size [#368](https://github.com/klauspost/compress/pull/368) 
.git/rebase-apply/patch:4296: trailing whitespace.
	
.git/rebase-apply/patch:4318: trailing whitespace.
  
warning: squelched 42 whitespace errors
warning: 47 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	control-plane/pkg/reconciler/kafka/testing/admin_mock.go
M	go.mod
M	go.sum
M	vendor/golang.org/x/net/http2/transport.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/golang.org/x/net/http2/transport.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/net/http2/transport.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging control-plane/pkg/reconciler/kafka/testing/admin_mock.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump Sarama to v1.30.0
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-0.26

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/test-infra 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. area/control-plane cla: yes Indicates the PR's author has signed the CLA. 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.

4 participants