* 'release-1.6' of https://github.com/kubernetes/kubernetes.github.io: * 'master' of https://github.com/kubernetes/kubernetes.github.io: (23 commits) Apply changes from PR #2787 rephrase the sentence to make expression clear (#2789) update index.md (#2788) Apply changes from PR #2784 (#2950) The link URL of [kube-controller-manager] is wrong Added pod name in run command Fix grammar in docs/admin/daemon.md update index.md (#2755) Update garbage-collection.md (#2732) Fix typo (#2842) Fix typo Fix the typos Apply typo fixes from #2791 (#2949) Fix typo in kubectl_completion.md fix typeo (#2856) Use kubectl config current-context to simplify the instructions fix a typo in /docs/user-guide/configmap/index.md Fix monitor-node-health.md amend monitor-node-health.md Update manage-compute-resources-container.md ... # Conflicts: # docs/tools/index.md |
||
---|---|---|
.. | ||
OWNERS | ||
index.md | ||
pod-with-node-affinity.yaml | ||
pod-with-pod-affinity.yaml | ||
pod.yaml |