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
+1 -1
View File
@@ -138,7 +138,7 @@ message NetworkPolicyPeer {
// NetworkPolicyPort describes a port to allow traffic on
message NetworkPolicyPort {
// The protocol (TCP or UDP) which traffic must match. If not specified, this
// The protocol (TCP, UDP, or SCTP) which traffic must match. If not specified, this
// field defaults to TCP.
// +optional
optional string protocol = 1;