Merge pull request #73976 from jennybuckley/apply-errors

Browse Source

Make server-side apply's conflict errors more human readable

Kubernetes-commit: 62734d36705f3b0bb2a1a6fc9cf00b5206fede20

...

This commit is contained in:

Kubernetes Publisher

2019-02-14 17:05:21 -08:00

parent 347c2688d7 fb0d8cffef

commit 2fb0948fde

27 changed files with 216 additions and 3897 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Godeps/Godeps.json

Generated

+211 -231

File diff suppressed because it is too large Load Diff