Closed dependabot[bot] closed 1 year ago
Hi @dependabot[bot]. Thanks for your PR.
I'm waiting for a medik8s member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test
on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.
Once the patch is verified, the new status will be reflected by the ok-to-test
label.
I understand the commands that are listed here.
/ok-to-test
/lgtm /approve /override e2e-k8s
@slintes: Overrode contexts on behalf of slintes: e2e-k8s
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: dependabot[bot], slintes
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/cherry-pick release-0.6 /cherry-pick release-0.4
@slintes: new pull request created: #252
/cherry-pick release-0.4
@slintes: #251 failed to apply on top of branch "release-0.4":
Applying: Bump golang.org/x/net from 0.10.0 to 0.17.0
Using index info to reconstruct a base tree...
M go.mod
M go.sum
M vendor/golang.org/x/net/html/render.go
M vendor/golang.org/x/net/html/token.go
M vendor/golang.org/x/net/http2/server.go
M vendor/golang.org/x/net/http2/transport.go
M vendor/golang.org/x/sys/unix/mkall.sh
M vendor/golang.org/x/sys/unix/mkerrors.sh
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_bsd.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_linux_amd64.go
M vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
M vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
M vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
M vendor/golang.org/x/sys/unix/syscall_linux_riscv64.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_unix.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_linux.go
M vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.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_386.s
M vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
M vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s
M vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
M vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s
M vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
M vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s
M vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
A vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s
M vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
M vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s
M vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
M vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s
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/ztypes_linux.go
M vendor/golang.org/x/sys/unix/ztypes_linux_386.go
M vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
M vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
M vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
M vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
M vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
M vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
M vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
M vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
M vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
M vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
M vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
M vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
M vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
M vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
M vendor/golang.org/x/sys/windows/exec_windows.go
M vendor/golang.org/x/sys/windows/service.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/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/sys/windows/zsyscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/types_windows.go
Auto-merging vendor/golang.org/x/sys/windows/syscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/service.go
Auto-merging vendor/golang.org/x/sys/windows/exec_windows.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/windows/exec_windows.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s deleted in HEAD and modified in Bump golang.org/x/net from 0.10.0 to 0.17.0. Version Bump golang.org/x/net from 0.10.0 to 0.17.0 of vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s left in tree.
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_freebsd_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_unix.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_solaris.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_openbsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_netbsd.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_netbsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_dragonfly.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_darwin.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_darwin.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_bsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_aix.go
Auto-merging vendor/golang.org/x/sys/unix/mkerrors.sh
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/mkerrors.sh
Auto-merging vendor/golang.org/x/sys/unix/mkall.sh
Removing vendor/golang.org/x/sys/internal/unsafeheader/unsafeheader.go
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 vendor/golang.org/x/net/http2/server.go
Removing vendor/golang.org/x/net/http2/Makefile
Removing vendor/golang.org/x/net/http2/Dockerfile
Auto-merging vendor/golang.org/x/net/html/token.go
Auto-merging vendor/golang.org/x/net/html/render.go
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.10.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".
Bumps golang.org/x/net from 0.10.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