Vendor the exact same version of mergo used by k8s

Merging is buggy in master: darccio/mergo#33
weaveworks · Aug 18, 2016 · 47056bd · 47056bd
1 parent 7435b45
commit 47056bd
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 61 deletions.
diff --git a/vendor/github.com/imdario/mergo/map.go b/vendor/github.com/imdario/mergo/map.go
diff --git a/vendor/github.com/imdario/mergo/merge.go b/vendor/github.com/imdario/mergo/merge.go
diff --git a/vendor/manifest b/vendor/manifest
@@ -893,8 +893,8 @@
 			"importpath": "github.com/imdario/mergo",
 			"repository": "https://github.com/imdario/mergo",
 			"vcs": "git",
-			"revision": "50d4dbd4eb0e84778abe37cefef140271d96fade",
-			"branch": "master",
+			"revision": "6633656539c1639d9d78127b7d47c622b5d7b6dc",
+			"branch": "HEAD",
 			"notests": true
 		},
 		{