bump imdario/mergo v0.3.12

full diff: imdario/mergo@v0.3.8...v0.3.12 includes: - darccio/mergo@c085d66 use src map if dst is nil and can't be set - fixes darccio/mergo#90 panic: reflect: reflect.Value.Set using unaddressable value merging nested structures Signed-off-by: Jonathan Warriss-Simmons <misterws@diogenes.ws> Upstream-commit: 221bf5761fa56ed88cb6ee0b5081b4885326e41e Component: cli
docker · Sep 18, 2021 · 106b9a5 · 106b9a5
1 parent 3d8c212
commit 106b9a5
Show file tree

Hide file tree

Showing 7 changed files with 289 additions and 95 deletions.
diff --git a/components/cli/vendor.conf b/components/cli/vendor.conf
@@ -36,7 +36,7 @@ github.com/grpc-ecosystem/go-grpc-middleware        3c51f7f332123e8be5a157c0802a
 github.com/grpc-ecosystem/grpc-gateway              1a03ca3bad1e1ebadaedd3abb76bc58d4ac8143b
 github.com/grpc-ecosystem/grpc-opentracing          8e809c8a86450a29b90dcc9efbf062d0fe6d9746
 github.com/hashicorp/golang-lru                     7f827b33c0f158ec5dfbba01bb0b14a4541fd81d # v0.5.3
-github.com/imdario/mergo                            1afb36080aec31e0d1528973ebe6721b191b0369 # v0.3.8
+github.com/imdario/mergo                            29fb3d3bdc5512887f1dc9aedde6a0fed407fa8f # v0.3.12
 github.com/inconshreveable/mousetrap                76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 # v1.0.0
 github.com/jaguilar/vt100                           ad4c4a5743050fb7f88ce968dca9422f72a0e3f2 git://github.com/tonistiigi/vt100.git
 github.com/json-iterator/go                         a1ca0830781e007c66b225121d2cdb3a649421f6 # v1.1.10

diff --git a/components/cli/vendor/github.com/imdario/mergo/README.md b/components/cli/vendor/github.com/imdario/mergo/README.md
diff --git a/components/cli/vendor/github.com/imdario/mergo/doc.go b/components/cli/vendor/github.com/imdario/mergo/doc.go
diff --git a/components/cli/vendor/github.com/imdario/mergo/go.mod b/components/cli/vendor/github.com/imdario/mergo/go.mod
diff --git a/components/cli/vendor/github.com/imdario/mergo/map.go b/components/cli/vendor/github.com/imdario/mergo/map.go