Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'master' of https://github.com/kubernetes/kubernetes.github.io: (62 commits) Move Guide topic: Admin Guide Move Guide topic: Resource Monitoring. (#2895) Move Guide topic: Service. (#2891) Move Guide topic: Connecting Apps with Services. (#2885) Move Guide topic: Federation Service Discovery. (#2884) Move Guide topic: Config Provider Firewalls. (#2883) Move Guide topic: Kubeconfig File Move Accessing Clusters topic to Concepts. (#2875) Move Guide topic: Sharing Clusters Move Guide topic: Prereqs Move Garbage Collection topic. (#2874) Move PetSets topic. (#2873) Move Guide topic: Pod Templates (#2872) Move StatefulSets topic. (#2869) Rename /docs/tasks/job/work-queue-1/ Move Guide topic: Fine Parallel Processing using a Work Queue (#2870) Move Guide topic: Coarse Parallel Processing Using a Work Queue Move Init Containers topic. (#2866) Move Guide topic: Parallel Processing using Expansions (#2867) Move Pod overview. (#2865) ... # Conflicts: # docs/api.md # docs/user-guide/jobs.md
This commit is contained in:
@@ -170,6 +170,7 @@ toc:
|
||||
section:
|
||||
- docs/admin/index.md
|
||||
- docs/admin/cluster-management.md
|
||||
- docs/admin/upgrade-1-6.md
|
||||
- docs/admin/kubeadm.md
|
||||
- docs/admin/addons.md
|
||||
- docs/admin/node-allocatable.md
|
||||
|
||||
Reference in New Issue
Block a user