Files
kubernetes/pkg
Kubernetes Submit Queue 778da50811 Merge pull request #49259 from dixudx/fix_jsonpatch_nil_value_merge
Automatic merge from submit-queue (batch tested with PRs 49259, 49350)

update json-patch to fix nil value issue when creating mergepatch

**What this PR does / why we need it**:
When [creating a patch for merge](https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/annotate.go#L255), nil value will be considered as different value. This has been fixed and merged in [evanphx/json-patch #45](https://github.com/evanphx/json-patch/pull/45).

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #49044

**Special notes for your reviewer**:
/cc @MikeSpreitzer @mengqiy 

**Release note**:

```release-note
Fix nil value issue when creating json patch for merge
```
2017-07-25 20:01:27 -07:00
..
2017-06-22 11:31:03 -07:00
2017-07-20 11:03:49 -07:00
2017-07-18 14:34:08 +08:00
2017-06-22 11:31:03 -07:00
2017-07-25 09:01:37 -04:00
2017-07-21 14:29:59 -07:00