sample-controller/vendor/k8s.io/apimachinery/pkg
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
..
api Merge pull request #65779 from cblecker/mergo-update 2018-08-18 02:39:08 +00:00
apis/meta Merge pull request #65779 from cblecker/mergo-update 2018-08-18 02:39:08 +00:00
conversion Merge pull request #66218 from atlassian/handle-errors 2018-07-20 21:52:03 +00:00
fields Merge pull request #63059 from ceshihao/upgrade_json_package_fix_base64_newline 2018-04-26 07:24:17 +00:00
labels Merge pull request #67178 from cblecker/cfssl 2018-08-16 15:22:34 +00:00
runtime Merge pull request #65779 from cblecker/mergo-update 2018-08-18 02:39:08 +00:00
selection sync: initially remove files BUILD */BUILD BUILD.bazel */BUILD.bazel 2018-03-21 23:27:59 +00:00
types Merge pull request #61800 from rithujohn191/remove-gopass 2018-04-06 12:04:33 +00:00
util Merge pull request #65904 from deads2k/api-02-trackscheme 2018-07-08 02:52:46 +00:00
version Merge pull request #53944 from gregory-m/sample-controller-tests 2018-05-23 03:28:43 +00:00
watch Merge pull request #66906 from tnozicka/rename-until 2018-08-16 15:23:25 +00:00