Merge branch 'master' into mvgen

This commit is contained in:
XsWack
2017-11-16 09:30:49 +08:00
committed by GitHub
7 changed files with 132 additions and 5 deletions
+1
View File
@@ -417,6 +417,7 @@ https://kubernetes-io-v1-7.netlify.com/* https://v1-7.docs.kubernetes.io/"spl
/docs/admin/kube-proxy/ /docs/reference/generated/kube-proxy/ 301
/docs/admin/kube-scheduler/ /docs/reference/generated/kube-scheduler/ 301
/docs/admin/kube-scheduler/ /docs/reference/generated/kube-scheduler/ 301
/docs/admin/kubeadm/ /docs/reference/generated/kubeadm/ 301
/docs/admin/federation-controller-manager/ /docs/reference/generated/federation-controller-manager/ 301
/docs/admin/federation-apiserver/ /docs/reference/generated/federation-apiserver/ 301
/docs/admin/kubefed/ /docs/reference/generated/kubefed/ 301