scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-26 19:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump github.com/golang/protobuf v1.5.4, google.golang.org/protobuf v1.33.0

Browse Source
This commit is contained in:
Jordan Liggitt
2024-03-06 09:47:28 -05:00
parent 546f7c3086
commit c6673d2346
123 changed files with 4118 additions and 1417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/google.golang.org/protobuf/proto/merge.go generated vendored
View File

@@ -21,7 +21,7 @@ import (
// The unknown fields of src are appended to the unknown fields of dst.
//
// It is semantically equivalent to unmarshaling the encoded form of src
// into dst with the UnmarshalOptions.Merge option specified.
// into dst with the [UnmarshalOptions.Merge] option specified.
func Merge(dst, src Message) {
// TODO: Should nil src be treated as semantically equivalent to a
// untyped, read-only, empty message? What about a nil dst?