Merge branch 'master' into mvgen

This commit is contained in:
XsWack
2017-11-15 17:46:49 +08:00
committed by GitHub
11 changed files with 156 additions and 9 deletions
+10 -1
View File
@@ -416,4 +416,13 @@ https://kubernetes-io-v1-7.netlify.com/* https://v1-7.docs.kubernetes.io/"spl
/docs/admin/kube-controller-manager/ /docs/reference/generated/kube-controller-manager/ 301
/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/kube-scheduler/ /docs/reference/generated/kube-scheduler/ 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
/docs/admin/kubefed_init/ /docs/reference/generated/kubefed_init/ 301
/docs/admin/kubefed_join/ /docs/reference/generated/kubefed_join/ 30
/docs/admin/kubefed_options/ /docs/reference/generated/kubefed_options/ 301
/docs/admin/kubefed_unjoin/ /docs/reference/generated/kubefed_unjoin/ 301
/docs/admin/kubefed_version/ /docs/reference/generated/kubefed_version/ 301