Savitha Raghunathan 95c94c03d5 resolving conflicts

2020-08-23 12:13:37 -04:00

..

_index.md

Fix Left panel navigating bar layout issue for zh (#19517)

2020-03-25 21:14:24 -07:00

feature-gates.md

fix links to English pages in Chinese pages

2020-08-12 18:13:20 +08:00

kube-apiserver.md

zh: remove support for basic authentication

2020-05-06 17:47:54 -07:00

kube-controller-manager.md

Fix front matter

2020-07-25 12:46:36 +01:00

kube-proxy.md

Fix page front matter (zh localization)

2020-06-29 18:50:09 +01:00

kube-scheduler.md

Fix page front matter (zh localization)

2020-06-29 18:50:09 +01:00

kubelet-authentication-authorization.md

…

kubelet-tls-bootstrapping.md

Remove trailing spaces from zh documents(#16742) (#16794)

2019-10-15 02:23:51 -07:00

kubelet.md

Update kubelet.md

2020-07-22 22:15:36 +08:00