vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

vendor: update kube to v1.7.6

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2017-09-18 13:04:23 +02:00
parent e8cfe3b867
commit 5e7c932771
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
16 changed files with 893 additions and 870 deletions
Download patch file Download diff file Expand all files Collapse all files

2
vendor/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go generated vendored
View file

@ -1138,7 +1138,7 @@ func mergePatchIntoOriginal(original, patch map[string]interface{}, t reflect.Ty
return err
}
case !foundOriginal && !foundPatch:
return nil
continue
}
// Split all items into patch items and server-only items and then enforce the order.