Commit Graph

2 Commits

Author SHA1 Message Date
Alfonso Acosta
47056bde16 Vendor the exact same version of mergo used by k8s
Merging is buggy in master: https://github.com/imdario/mergo/issues/33
2016-08-18 15:32:49 +00:00
Alfonso Acosta
e9235a56ba Vendor github.com/imdario/mergo
In order to use k8s.io/kubernetes/pkg/client/unversioned/clientcmd/client_config.go
2016-08-17 15:15:34 +00:00