rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-07 18:12:06 +00:00
Code Issues Releases Wiki Activity

Update to k8s v1.20

Browse Source
This commit is contained in:
Darren Shepherd
2020-12-08 16:32:23 -07:00
parent e70f5ca388
commit 68f1d2e966
937 changed files with 126796 additions and 35141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vendor/github.com/google/uuid/marshal.go generated vendored
View File

@@ -16,10 +16,11 @@ func (uuid UUID) MarshalText() ([]byte, error) {
// UnmarshalText implements encoding.TextUnmarshaler.
func (uuid *UUID) UnmarshalText(data []byte) error {
id, err := ParseBytes(data)
if err == nil {
*uuid = id
if err != nil {
return err
}
return err
*uuid = id
return nil
}
// MarshalBinary implements encoding.BinaryMarshaler.