Merge pull request moby#42992 from thaJeztah/bump_mergo_v0.3.12

vendor: github.com/imdario/mergo v0.3.12
akerouanton · Nov 11, 2021 · df7bba7 · df7bba7
2 parents d116e12 + 5f79e03
commit df7bba7
Show file tree

Hide file tree

Showing 7 changed files with 289 additions and 95 deletions.
diff --git a/vendor.conf b/vendor.conf
@@ -27,7 +27,7 @@ gotest.tools/v3                                     568bc57cc5c19a2ef85e5749870b
 github.com/google/go-cmp                            3af367b6b30c263d47e8895973edcca9a49cf029 # v0.2.0
 
 github.com/RackSec/srslog                           a4725f04ec91af1a91b380da679d6e0c2f061e59
-github.com/imdario/mergo                            1afb36080aec31e0d1528973ebe6721b191b0369 # v0.3.8
+github.com/imdario/mergo                            29fb3d3bdc5512887f1dc9aedde6a0fed407fa8f # v0.3.12
 golang.org/x/sync                                   036812b2e83c0ddf193dd5a34e034151da389d09
 
 # buildkit

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