zacharysarah 258fc90f5a Merge branch 'master' into release-1.8

2017-12-06 14:45:26 -06:00

..

api-extension

Spelling correction and sentence capitalization.

2017-12-02 22:14:06 +07:00

architecture

Resolving merge conflicts with master

2017-11-30 18:53:33 -06:00

cluster-administration

markup fixes and clarify router-id role (#6491)

2017-11-29 16:01:21 -08:00

configuration

Resolving merge conflicts with master

2017-11-30 18:53:33 -06:00

containers

Rename Google Container Engine to Google Kubernetes Engine

2017-11-13 13:43:14 -08:00

overview

Add tooltip includes for terms

2017-11-27 14:43:36 -08:00

policy

Rewrite PodSecurityPolicy guide

2017-12-01 15:44:23 -08:00

service-catalog

Update index.md

2017-11-22 08:23:12 -05:00

services-networking

Update service.md

2017-11-24 11:02:19 +11:00

storage

Resolving merge conflicts with master

2017-11-30 18:53:33 -06:00

workloads

Resolving merge conflicts with master

2017-11-30 18:53:33 -06:00

example-concept-template.md

Rename OWNERS assignees: to approvers:

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

index.md

Fixed broken link to Pods concept documentation (#5223)

2017-09-01 16:57:29 -07:00