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
+8 -8
View File
@@ -73,12 +73,12 @@ toc:
- docs/admin/kubeadm.md
- title: Kubefed
section:
- docs/admin/kubefed.md
- docs/admin/kubefed_options.md
- docs/admin/kubefed_init.md
- docs/admin/kubefed_join.md
- docs/admin/kubefed_unjoin.md
- docs/admin/kubefed_version.md
- docs/reference/generated/kubefed.md
- docs/reference/generated/kubefed_options.md
- docs/reference/generated/kubefed_init.md
- docs/reference/generated/kubefed_join.md
- docs/reference/generated/kubefed_unjoin.md
- docs/reference/generated/kubefed_version.md
- title: Config Reference
section:
@@ -89,8 +89,8 @@ toc:
- docs/reference/generated/kube-proxy.md
- docs/reference/generated/kube-scheduler.md
- docs/admin/kubelet-tls-bootstrapping.md
- docs/admin/federation-apiserver.md
- docs/admin/federation-controller-manager.md
- docs/reference/generated/federation-apiserver.md
- docs/reference/generated/federation-controller-manager.md
- title: Kubernetes Design Docs
section: