Andrew Chen 021502d2a6 Merged master into release-1.10 and resolved merge conflicts.

2018-03-13 16:36:07 -07:00

..

clusters

Flag names changed (s/admission-control/enable-admission-plugins); disable-admissions-plugin entry added; removed reference to admission controller/plugins requiring set order (for v1.10), redundant example enabling specific plugin, and redundant version-specific info (#7449)

2018-03-08 12:00:56 -08:00

configuration

merge master to 1.10, with fixes (#7682)

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

kubernetes-basics

merge master to 1.10, with fixes (#7682)

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

online-training

merge master to 1.10, with fixes (#7682)

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

services

Convert registry to k8s.gcr.io

2017-12-22 09:55:16 -08:00

stateful-application

merge master to 1.10, with fixes (#7682)

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

stateless-application

Typo fix "these command"->"these commands" (#7715)

2018-03-12 08:43:12 -07:00

example-tutorial-template.md

merge master to 1.10, with fixes (#7682)

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

index.md

Add link to glossary page

2017-11-14 09:11:19 +08:00