apiserver/vendor/github.com
Kubernetes Publisher 41863d9181 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 01:54:15 +00:00
..
Azure/go-ansiterm Merge pull request #64517 from sttts/sttts-apiserver-sectioned-flags 2018-08-06 13:47:38 +00:00
NYTimes/gziphandler sync: resync vendor folder 2017-07-01 08:40:15 +00:00
PuerkitoBio sync: resync vendor folder 2017-02-23 11:13:21 -05:00
beorn7/perks sync: resync vendor folder 2017-02-23 11:13:21 -05:00
cockroachdb/cmux Merge pull request #57480 from jpbetz/etcd-client-3.2.12 2018-01-07 19:52:32 +00:00
coreos Merge pull request #58544 from ericchiang/oidc-v2 2018-02-27 01:30:40 +00:00
davecgh/go-spew sync: resync vendor folder 2017-07-19 03:49:47 +00:00
dgrijalva/jwt-go Merge pull request #57480 from jpbetz/etcd-client-3.2.12 2018-01-07 19:52:32 +00:00
docker/docker Merge pull request #64517 from sttts/sttts-apiserver-sectioned-flags 2018-08-06 13:47:38 +00:00
elazarl/go-bindata-assetfs sync: resync vendor folder 2017-02-23 11:13:21 -05:00
emicklei sync: resync vendor folder 2017-05-12 17:30:46 +00:00
evanphx/json-patch Merge pull request #64355 from liggitt/bump-jsonpatch 2018-06-01 18:52:13 +00:00
ghodss/yaml sync: resync vendor folder 2017-02-23 11:13:21 -05:00
gogo/protobuf sync: resync vendor folder 2017-04-12 20:36:01 +00:00
golang Merge pull request #64719 from davidz627/feature/CSIv0.3 2018-06-05 22:43:54 +00:00
google/btree sync: resync vendor folder 2017-05-12 17:30:46 +00:00
googleapis/gnostic Merge pull request #47353 from apelisse/http-cache 2017-08-29 13:14:36 +00:00
gregjones/httpcache Merge pull request #63550 from juanvallejo/jvallejo/move-cached-discovery 2018-05-15 18:56:04 +00:00
grpc-ecosystem Merge pull request #57480 from jpbetz/etcd-client-3.2.12 2018-01-07 19:52:32 +00:00
hashicorp/golang-lru sync: resync vendor folder 2017-05-17 17:28:28 +00:00
imdario/mergo Merge pull request #65779 from cblecker/mergo-update 2018-08-18 01:54:15 +00:00
jonboulle/clockwork sync: resync vendor folder 2017-02-23 11:13:21 -05:00
json-iterator/go Merge pull request #65034 from caesarxuchao/json-case-sensitive 2018-06-14 23:35:44 +00:00
mailru/easyjson Merge pull request #52793 from nikhita/crd-validation-conversion-tests 2017-10-16 06:49:06 +00:00
matttproud/golang_protobuf_extensions Merge pull request #66244 from sigma/pr/update-pb-ext 2018-08-17 05:56:01 +00:00
modern-go Merge pull request #63059 from ceshihao/upgrade_json_package_fix_base64_newline 2018-04-26 06:48:07 +00:00
pborman/uuid sync: resync vendor folder 2017-02-23 11:13:21 -05:00
peterbourgon/diskv Merge pull request #63550 from juanvallejo/jvallejo/move-cached-discovery 2018-05-15 18:56:04 +00:00
pmezard/go-difflib sync: resync vendor folder 2017-02-23 11:13:21 -05:00
pquerna/cachecontrol Merge pull request #58544 from ericchiang/oidc-v2 2018-02-27 01:30:40 +00:00
prometheus sync: resync vendor folder 2017-06-13 20:48:33 +00:00
sirupsen/logrus Merge pull request #64517 from sttts/sttts-apiserver-sectioned-flags 2018-08-06 13:47:38 +00:00
spf13/pflag Merge pull request #62505 from mtaufen/show-deprecated-help 2018-04-14 22:44:02 +00:00
stretchr/testify Merge pull request #62583 from vantuvt/testify_update 2018-04-19 18:46:58 +00:00
ugorji/go sync: resync vendor folder 2017-02-23 11:13:21 -05:00
xiang90/probing sync: resync vendor folder 2017-02-23 11:13:21 -05:00