Merge remote-tracking branch 'origin/master' into release-1.12. Deleting CHANGELOG-1.11.md

Kubernetes-commit: 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c
This commit is contained in:
Kubernetes Publisher
2018-09-04 00:05:19 +08:00
45 changed files with 3767 additions and 1831 deletions
+5
View File
@@ -1134,6 +1134,11 @@ func (in *PodSecurityPolicySpec) DeepCopyInto(out *PodSecurityPolicySpec) {
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.AllowedProcMountTypes != nil {
in, out := &in.AllowedProcMountTypes, &out.AllowedProcMountTypes
*out = make([]corev1.ProcMountType, len(*in))
copy(*out, *in)
}
return
}