mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-01-16 23:05:05 +00:00
Automatic merge from submit-queue (batch tested with PRs 38909, 39213) Add TLS conf for Go1.7 fixes #33936 / #38596 in master
Automatic merge from submit-queue (batch tested with PRs 38909, 39213) Add TLS conf for Go1.7 fixes #33936 / #38596 in master