Closed dependabot[bot] closed 11 months ago
[APPROVALNOTIFIER] This PR is NOT APPROVED
This pull-request has been approved by: dependabot[bot] Once this PR has been reviewed and has the lgtm label, please ask for approval from dmage. For more information see the Kubernetes Code Review Process.
The full list of commands accepted by this bot can be found here.
/retest
/cherrypick redhat-3.9
@dmage: once the present PR merges, I will cherry-pick it on top of redhat-3.9 in a new PR and assign it to you.
@dependabot[bot]: The following test failed, say /retest
to rerun all failed tests or /retest-required
to rerun all mandatory failed tests:
Test name | Commit | Details | Required | Rerun command |
---|---|---|---|---|
ci/prow/ocp-latest-e2e | 2055f7543d8608b15f6e29bb6361c7f0978d2846 | link | true | /test ocp-latest-e2e |
Full PR test history. Your PR dashboard.
/retest
@dmage: #90 failed to apply on top of branch "redhat-3.9":
Applying: Bump golang.org/x/net from 0.14.0 to 0.17.0
Using index info to reconstruct a base tree...
M go.mod
M go.sum
A vendor/golang.org/x/net/http2/Dockerfile
A vendor/golang.org/x/net/http2/Makefile
M vendor/golang.org/x/net/http2/server.go
M vendor/golang.org/x/net/http2/transport.go
A vendor/golang.org/x/sys/internal/unsafeheader/unsafeheader.go
M vendor/golang.org/x/sys/unix/ptrace_darwin.go
M vendor/golang.org/x/sys/unix/ptrace_ios.go
M vendor/golang.org/x/sys/unix/syscall_aix.go
M vendor/golang.org/x/sys/unix/syscall_darwin.go
M vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
M vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
M vendor/golang.org/x/sys/unix/syscall_dragonfly.go
M vendor/golang.org/x/sys/unix/syscall_freebsd.go
M vendor/golang.org/x/sys/unix/syscall_linux.go
M vendor/golang.org/x/sys/unix/syscall_netbsd.go
M vendor/golang.org/x/sys/unix/syscall_openbsd.go
M vendor/golang.org/x/sys/unix/syscall_solaris.go
M vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
M vendor/golang.org/x/sys/unix/zerrors_linux.go
M vendor/golang.org/x/sys/unix/zerrors_linux_386.go
M vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
M vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
M vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
M vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
M vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
M vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
M vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
M vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
M vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
M vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
M vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
M vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
M vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
M vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
M vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
M vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
M vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
M vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
M vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
M vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
M vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
M vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
M vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
M vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
M vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
M vendor/golang.org/x/sys/unix/zsyscall_freebsd_riscv64.go
M vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go
M vendor/golang.org/x/sys/unix/zsyscall_linux.go
M vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
M vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
M vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
M vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
M vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
M vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
M vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
M vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
M vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
M vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
M vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
M vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
M vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
M vendor/golang.org/x/sys/unix/ztypes_linux.go
M vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
M vendor/golang.org/x/sys/windows/exec_windows.go
M vendor/golang.org/x/sys/windows/security_windows.go
M vendor/golang.org/x/sys/windows/syscall_windows.go
M vendor/golang.org/x/sys/windows/types_windows.go
M vendor/golang.org/x/sys/windows/zsyscall_windows.go
M vendor/golang.org/x/text/unicode/norm/trie.go
M vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
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 golang.org/x/net from 0.14.0 to 0.17.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".
/cherrypick redhat-3.10
@dmage: new pull request created: #95
Bumps golang.org/x/net from 0.14.0 to 0.17.0.
Commits
b225e7c
http2: limit maximum handler goroutines to MaxConcurrentStreams88194ad
go.mod: update golang.org/x dependencies2b60a61
quic: fix several bugs in flow control accounting73d82ef
quic: handle DATA_BLOCKED frames5d5a036
quic: handle streams moving from the data queue to the meta queue350aad2
quic: correctly extend peer's flow control window after MAX_DATA21814e7
quic: validate connection id transport parametersa600b35
quic: avoid redundant MAX_DATA updatesea63359
http2: check stream body is present on read timeoutddd8598
quic: version negotiationDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show