github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update generated

Browse Source
This commit is contained in:
jennybuckley
2019-07-17 14:59:50 -07:00
committed by Jennifer Buckley
parent 229894c730
commit 018a3db25e
11 changed files with 90 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/sigs.k8s.io/structured-merge-diff/merge/conflict.go generated vendored
View File

@@ -79,7 +79,7 @@ func ConflictsFromManagers(sets fieldpath.ManagedFields) Conflicts {
conflicts := []Conflict{}
for manager, set := range sets {
set.Iterate(func(p fieldpath.Path) {
set.Set().Iterate(func(p fieldpath.Path) {
conflicts = append(conflicts, Conflict{
Manager: manager,
Path: p,