Update to newest imgcrypt, aufs and zfs
Older versions transitively dragged in k8s.io/kubernetes, the newer versions do not. Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
5
vendor/github.com/imdario/mergo/merge.go
generated
vendored
5
vendor/github.com/imdario/mergo/merge.go
generated
vendored
@@ -271,11 +271,6 @@ func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int, co
|
||||
}
|
||||
default:
|
||||
mustSet := (isEmptyValue(dst) || overwrite) && (!isEmptyValue(src) || overwriteWithEmptySrc)
|
||||
v := fmt.Sprintf("%v", src)
|
||||
if v == "TestIssue106" {
|
||||
fmt.Println(mustSet)
|
||||
fmt.Println(dst.CanSet())
|
||||
}
|
||||
if mustSet {
|
||||
if dst.CanSet() {
|
||||
dst.Set(src)
|
||||
|
||||
Reference in New Issue
Block a user