mirror of
https://github.com/kubernetes/sample-controller.git
synced 2025-01-19 07:52:52 +08:00
acc9f193ca
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. update github.com/imdario/mergo to v0.3.5 **What this PR does / why we need it**: Updates github.com/imdario/mergo library to v0.3.5. We were pinned because of a functionality change in the dependency, however, a new function was introduced with similar functionality to the old. There is apparently some Debian packaging issues (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=878254) because of this. I'm still not clear what those are, unless they are forcing the library to update, as opposed to using our `vendor/`. That said, this will allow for some of those vendor conflicts to resolve for anyone else who is using client-go, so that's at least worthwhile. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: fixes #27543, fixes https://github.com/kubernetes/client-go/issues/431 **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` Kubernetes-commit: 6b4135267911b6c10ed536308d29d2a7c453eef6 |
||
|---|---|---|
| .. | ||
| Godeps.json | ||
| OWNERS | ||
| Readme | ||
This directory tree is generated automatically by godep. Please do not edit. See https://github.com/tools/godep for more information.