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
..
index.md	Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6	2017-03-27 16:12:50 -07:00
rbac.md	Outline service account RBAC approaches	2017-03-22 15:50:40 -04:00