Andrew Chen a82498bda5 Merge master into release-1.10

2018-03-26 17:34:56 -07:00

..

admin

merge master to 1.10, with fixes (#7682)

2018-03-08 11:03:55 -08:00

concepts

merge master to 1.10, with fixes (#7682)

2018-03-08 11:03:55 -08:00

reference

translate doc labels-annotations-taints into Chinese

2017-11-23 13:42:33 +08:00

tasks

merge master to 1.10, with fixes (#7682)

2018-03-08 11:03:55 -08:00

tutorials

merge master to 1.10, with fixes (#7682)

2018-03-08 11:03:55 -08:00

user-guide

merge master to 1.10, with fixes (#7682)

2018-03-08 11:03:55 -08:00

.gitkeep

Create a top-level CN directory to hold future md files for the Chinese kubernetes site

2017-03-07 21:49:59 -08:00

whatisk8s.md

Rename OWNERS assignees: to approvers:

2017-08-03 16:22:52 -07:00