Closed mergify[bot] closed 5 months ago
Cherry-pick of ae7f513816d0faba42a7b6bc0953363d25e6ed69 has failed:
On branch mergify/bp/release-v3.10/pr-4554
Your branch is up to date with 'origin/release-v3.10'.
You are currently cherry-picking commit ae7f51381.
(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)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: build.env
both modified: go.mod
no changes added to commit (use "git add" and/or "git commit -a")
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
/test ci/centos/k8s-e2e-external-storage/1.26
/test ci/centos/upgrade-tests-cephfs
/test ci/centos/mini-e2e-helm/k8s-1.26
/test ci/centos/upgrade-tests-rbd
/test ci/centos/k8s-e2e-external-storage/1.27
/test ci/centos/mini-e2e/k8s-1.26
/test ci/centos/mini-e2e-helm/k8s-1.27
/test ci/centos/mini-e2e/k8s-1.27
/test ci/centos/k8s-e2e-external-storage/1.28
/test ci/centos/mini-e2e-helm/k8s-1.28
/test ci/centos/mini-e2e/k8s-1.28
/test ci/centos/upgrade-tests-cephfs
/test ci/centos/upgrade-tests-rbd
/test ci/centos/k8s-e2e-external-storage/1.26
/test ci/centos/k8s-e2e-external-storage/1.27
/test ci/centos/mini-e2e-helm/k8s-1.26
/test ci/centos/mini-e2e-helm/k8s-1.27
/test ci/centos/mini-e2e/k8s-1.26
/test ci/centos/k8s-e2e-external-storage/1.28
/test ci/centos/mini-e2e/k8s-1.27
/test ci/centos/mini-e2e-helm/k8s-1.28
/test ci/centos/mini-e2e/k8s-1.28
/test ci/centos/k8s-e2e-external-storage/1.26
/test ci/centos/upgrade-tests-cephfs
/test ci/centos/mini-e2e-helm/k8s-1.26
/test ci/centos/upgrade-tests-rbd
/test ci/centos/mini-e2e/k8s-1.26
/test ci/centos/k8s-e2e-external-storage/1.27
/test ci/centos/k8s-e2e-external-storage/1.28
/test ci/centos/mini-e2e-helm/k8s-1.27
/test ci/centos/mini-e2e-helm/k8s-1.28
/test ci/centos/mini-e2e/k8s-1.27
/test ci/centos/mini-e2e/k8s-1.28
/test ci/centos/k8s-e2e-external-storage/1.28
/test ci/centos/mini-e2e-helm/k8s-1.28
/test ci/centos/upgrade-tests-cephfs
/test ci/centos/mini-e2e/k8s-1.28
/test ci/centos/k8s-e2e-external-storage/1.26
/test ci/centos/k8s-e2e-external-storage/1.27
/test ci/centos/upgrade-tests-rbd
/test ci/centos/mini-e2e-helm/k8s-1.26
/test ci/centos/mini-e2e-helm/k8s-1.27
/test ci/centos/mini-e2e/k8s-1.26
/test ci/centos/mini-e2e/k8s-1.27
/test ci/centos/k8s-e2e-external-storage/1.26
/test ci/centos/upgrade-tests-cephfs
/test ci/centos/mini-e2e-helm/k8s-1.26
/test ci/centos/upgrade-tests-rbd
/test ci/centos/mini-e2e/k8s-1.26
Update from v1.21.5 to latest v1.21.9, to include the following fixes:
go1.21.6 (released 2024-01-09) includes fixes to the compiler, the runtime, and the crypto/tls, maps, and runtime/pprof packages.
go1.21.7 (released 2024-02-06) includes fixes to the compiler, the go command, the runtime, and the crypto/x509 package.
go1.21.8 (released 2024-03-05) includes security fixes to the crypto/x509, html/template, net/http, net/http/cookiejar, and net/mail packages, as well as bug fixes to the go command and the runtime.
go1.21.9 (released 2024-04-03) includes a security fix to the net/http package, as well as bug fixes to the linker, and the go/types and net/http packages.
See-also: https://go.dev/doc/devel/release#go1.21.0 Signed-off-by: Niels de Vos ndevos@ibm.com
This is an automatic backport of pull request #4554 done by Mergify.