sample-controller/vendor/github.com
Kubernetes Publisher acc9f193ca Merge pull request #65779 from cblecker/mergo-update
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
2018-08-18 02:39:08 +00:00
..
davecgh/go-spew Merge pull request #52753 from munnerz/sample-controller 2017-10-26 12:35:59 +00:00
ghodss/yaml Merge pull request #52753 from munnerz/sample-controller 2017-10-26 12:35:59 +00:00
gogo/protobuf Merge pull request #52753 from munnerz/sample-controller 2017-10-26 12:35:59 +00:00
golang Merge pull request #64719 from davidz627/feature/CSIv0.3 2018-06-05 23:39:06 +00:00
google Merge pull request #63550 from juanvallejo/jvallejo/move-cached-discovery 2018-05-15 19:43:35 +00:00
googleapis/gnostic Merge pull request #52753 from munnerz/sample-controller 2017-10-26 12:35:59 +00:00
gregjones/httpcache Merge pull request #63550 from juanvallejo/jvallejo/move-cached-discovery 2018-05-15 19:43:35 +00:00
hashicorp/golang-lru Merge pull request #52753 from munnerz/sample-controller 2017-10-26 12:35:59 +00:00
imdario/mergo Merge pull request #65779 from cblecker/mergo-update 2018-08-18 02:39:08 +00:00
json-iterator/go Merge pull request #65034 from caesarxuchao/json-case-sensitive 2018-06-15 00:25:19 +00:00
modern-go Merge pull request #63059 from ceshihao/upgrade_json_package_fix_base64_newline 2018-04-26 07:24:17 +00:00
peterbourgon/diskv Merge pull request #63550 from juanvallejo/jvallejo/move-cached-discovery 2018-05-15 19:43:35 +00:00
spf13/pflag Merge pull request #62505 from mtaufen/show-deprecated-help 2018-04-14 23:21:57 +00:00