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

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

..

api-extension

Merged master into release-1.10 and resolved merge conflicts.

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

architecture

merge master to 1.10, with fixes (#7682)

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

cluster-administration

Merged master into release-1.10 and resolved merge conflicts.

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

configuration

Merged master into release-1.10 and resolved merge conflicts.

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

containers

merge master to 1.10, with fixes (#7682)

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

overview

Removed doc line descibing invocation of swagger UI (#7683)

2018-03-08 15:07:11 -08:00

policy

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

service-catalog

merge master to 1.10, with fixes (#7682)

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

services-networking

Merged master into release-1.10 and resolved merge conflicts.

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

storage

Merged master into release-1.10 and resolved merge conflicts.

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

workloads

remove description about "scale jobs" (#7712)

2018-03-12 18:39:09 -07:00

example-concept-template.md

merge master to 1.10, with fixes (#7682)

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

index.md

Fixed broken link to Pods concept documentation (#5223)

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