Jennifer Rondeau 3d79703d23 merge master to 1.10, with fixes (#7682)

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

..

nginx

merge master to 1.10, with fixes (#7682)

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

addons.md

fix calico install manual url (#8053)

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

certificates.md

Fix curl arguments (#8062)

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

cloud-providers.md

…

cluster-administration-overview.md

merge master to 1.10, with fixes (#7682)

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

controller-metrics.md

…

counter-pod.yaml

…

device-plugins.md

merge master to 1.10, with fixes (#7682)

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

federation.md

merge master to 1.10, with fixes (#7682)

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

fluentd-sidecar-config.yaml

…

kubelet-garbage-collection.md

merge master to 1.10, with fixes (#7682)

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

logging.md

merge master to 1.10, with fixes (#7682)

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

manage-deployment.md

merge master to 1.10, with fixes (#7682)

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

network-plugins.md

merge master to 1.10, with fixes (#7682)

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

networking.md

Remove reference to the deprecated OVS document (#7718)

2018-03-15 12:17:25 -07:00

nginx-app.yaml

merge master to 1.10, with fixes (#7682)

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

nginx-deployment.yaml~HEAD

merge master to 1.10, with fixes (#7682)

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

nginx-deployment.yaml~merge master to 1.10, with fixes (#7682)

merge master to 1.10, with fixes (#7682)

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

proxies.md

…

two-files-counter-pod-agent-sidecar.yaml

…

two-files-counter-pod-streaming-sidecar.yaml

…

two-files-counter-pod.yaml

…