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]>
zappy-shu · Jan 21, 2020 · 6cf7970 · 6cf7970
1 parent 9b420b1
commit 6cf7970
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 12 deletions.
diff --git a/vendor.conf b/vendor.conf
@@ -34,7 +34,7 @@ github.com/gorilla/mux                              00bdffe0f3c77e27d2cf6f5c7023
 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                            7c29201646fa3de8506f701213473dd407f19646 # v0.3.7
+github.com/imdario/mergo                            1afb36080aec31e0d1528973ebe6721b191b0369 # v0.3.8
 github.com/inconshreveable/mousetrap                76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 # v1.0.0
 github.com/jaguilar/vt100                           ad4c4a5743050fb7f88ce968dca9422f72a0e3f2 git://github.com/tonistiigi/vt100.git
 github.com/json-iterator/go                         0ff49de124c6f76f8494e194af75bde0f1a49a29 # 1.1.6

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