Andrew Chen b56358283a Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7 ...

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Fixed a minor mistake
  docs/concepts/policy/pod-security-policy.md: add projected to list of allowed types.
  Init container exists beta in 1.6.

2017-05-30 15:52:35 -07:00

..

controllers

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

2017-05-30 11:59:54 -07:00

pods

Init container exists beta in 1.6.

2017-05-30 12:03:52 -07:00