Zach Corleissen 5a85aed682 Resolved merge conflict, removed merge artifacts (#7947)

2018-04-16 12:09:19 -07:00

..

authorization

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

federation

merge master to 1.10, with fixes (#7682)

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

high-availability

Pvcprotection toc (#7807)

2018-03-21 14:30:04 -07:00

limitrange

merge master to 1.10, with fixes (#7682)

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

multiple-schedulers

merge master to 1.10, with fixes (#7682)

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

resourcequota

merge master to 1.10, with fixes (#7682)

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

accessing-the-api.md

merge master to 1.10, with fixes (#7682)

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

admission-controllers.md

Remove PersistentVolumeLabel from default admission controllers. (#7929)

2018-04-16 12:09:15 -07:00

authentication.md

Clarify caching of exec auth tokens (#7881)

2018-04-16 12:09:15 -07:00

bootstrap-tokens.md

merge master to 1.10, with fixes (#7682)

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

cluster-large.md

merge master to 1.10, with fixes (#7682)

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

extensible-admission-controllers.md

Resolved merge conflict, removed merge artifacts (#7947)

2018-04-16 12:09:19 -07:00

kubelet-authentication-authorization.md

merge master to 1.10, with fixes (#7682)

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

kubelet-tls-bootstrapping.md

merge master to 1.10, with fixes (#7682)

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

multiple-zones.md

It's better to be "behavior" (#7738)

2018-03-15 09:53:24 -07:00

node-conformance.md

merge master to 1.10, with fixes (#7682)

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

OWNERS

merge master to 1.10, with fixes (#7682)

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

salt.md

merge master to 1.10, with fixes (#7682)

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

service-accounts-admin.md

merge master to 1.10, with fixes (#7682)

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