Andrew Chen 403c2c1510 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6 ...

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  s/Wildard/Wildcard/
  rephrase the sentence
  Fix the number of processes on Kubernetes master (#2985)
  Pod Security Policy doc improvements (#3010)
  docs/admin: document OpenID Connect plugin "extra-scopes" field

# Conflicts:
#	docs/admin/kubelet.md
#	docs/user-guide/pod-security-policy/index.md

2017-03-27 16:12:50 -07:00

..

admin

Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

2017-03-27 16:12:50 -07:00

api-reference

Fix ref docs links in 1.6

2017-03-24 17:16:36 -07:00

concepts

Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

2017-03-27 16:12:50 -07:00

contribute

Replace the tab with 4 spaces in md files (#2797)

2017-03-23 00:10:00 -07:00

federation/api-reference

Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

2017-03-23 00:19:33 -07:00

getting-started-guides

New deployments endpoint (#2986)

2017-03-24 11:03:01 -07:00

resources-reference

Fix ref docs links in 1.6

2017-03-24 17:16:36 -07:00

tasks

Add guide for deploying Stackdriver Logging (#2922)

2017-03-27 08:44:55 -07:00

tools

update index.md (#2755)

2017-03-21 18:29:21 -07:00

tutorials

Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

2017-03-27 09:31:30 -07:00

user-guide

Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

2017-03-27 16:12:50 -07:00

api.md

Merge branch 'release-1.6' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

2017-03-20 13:53:52 -07:00

deprecation-policy.md

fix typo

2017-02-23 15:30:47 +08:00

index.md

Update kubeadm guide and reference pages for 1.6

2017-03-19 10:04:17 -07:00

reference.md

Replace the tab with 4 spaces in md files (#2797)

2017-03-23 00:10:00 -07:00

reporting-security-issues.md

Merge pull request #1819 from philips/security

2016-12-22 18:50:51 -08:00

samples.md

add explicit titles to docs

2016-12-15 15:16:54 -05:00

search.md

…

sitemap.md

…

troubleshooting.md

fix typos

2016-12-28 17:48:46 +08:00

whatisk8s.md

Move What is Kubernetes topic. (#2851)

2017-03-15 17:21:06 -07:00