Merge master into dev-1.19 to keep in sync

This commit is contained in:
Anna Jung
2020-08-11 08:32:19 -05:00
358 changed files with 16526 additions and 6800 deletions
+2 -1
View File
@@ -445,7 +445,8 @@
/docs/admin/kubeadm/ /docs/reference/generated/kubeadm/ 301
/docs/admin/kubelet/ /docs/reference/generated/kubelet/ 301
/docs/reference/generated/kubeadm/ /docs/reference/setup-tools/kubeadm/kubeadm/ 301
/docs/reference/generated/kubeadm/ /docs/reference/setup-tools/kubeadm/ 301
/docs/reference/setup-tools/kubeadm/kubeadm/ /docs/reference/setup-tools/kubeadm/ 301
/editdocs/ /docs/contribute/ 301
/docs/home/editdocs/ /docs/contribute/ 301