bump imdario/mergo v0.3.8

full diff: darccio/mergo@v0.3.7...v0.3.8 includes: - darccio/mergo#112 Add strict override - fixes darccio/mergo#111 WithOverride should be able to check types - darccio/mergo#106 Fix merging of interface types with concrete values - darccio/mergo#120 should not overwrite pointers directly, instead check embedded values - fixes darccio/mergo#114 Embedded struct of pointer types will overwrite the whole destination struct - darccio/mergo#125 added WithOverrideEmptySlice config flag Signed-off-by: Sebastiaan van Stijn <[email protected]> Upstream-commit: 9bd1b1a8eca97a2403bc7a2ed9a52427d8c27078 Component: engine
docker-archive · Oct 6, 2019 · 95072a9 · 95072a9
1 parent 09cfc68
commit 95072a9
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 12 deletions.
diff --git a/components/engine/vendor.conf b/components/engine/vendor.conf
@@ -22,7 +22,7 @@ github.com/google/go-cmp                            3af367b6b30c263d47e8895973ed
 github.com/syndtr/gocapability                      d98352740cb2c55f81556b63d4a1ec64c5a319c2
 
 github.com/RackSec/srslog                           a4725f04ec91af1a91b380da679d6e0c2f061e59
-github.com/imdario/mergo                            7c29201646fa3de8506f701213473dd407f19646 # v0.3.7
+github.com/imdario/mergo                            1afb36080aec31e0d1528973ebe6721b191b0369 # v0.3.8
 golang.org/x/sync                                   e225da77a7e68af35c70ccbf71af2b83e6acac3c
 
 # buildkit

diff --git a/components/engine/vendor/github.com/imdario/mergo/merge.go b/components/engine/vendor/github.com/imdario/mergo/merge.go