kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-07-16 17:33:14 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Some cleanup refactoring in app package.

Browse Source
This commit is contained in:
jregan
2018-06-09 18:50:53 -07:00
committed by Jeffrey Regan
parent 6b5569d5ed
commit 211cda054e
8 changed files with 145 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/resmap/resmap_test.go
View File

@@ -191,7 +191,7 @@ func TestMerge(t *testing.T) {
},
}),
}
merged, err := Merge(input...)
merged, err := MergeWithoutOverride(input...)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}