k3s/api
Kubernetes Submit Queue 2296c73292 Merge pull request #54241 from zouyee/strategic-merge-patch
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 strategic-merge-patch link

**What this PR does / why we need it**:
update strategic-merge-patch link
**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```
NONE
```
2017-10-19 17:39:48 -07:00
..
openapi-spec Merge pull request #54241 from zouyee/strategic-merge-patch 2017-10-19 17:39:48 -07:00
swagger-spec generated 2017-10-19 08:06:38 -04:00
BUILD Use buildozer to delete licenses() rules except under third_party/ 2017-08-11 09:32:39 -07:00
OWNERS Add liggitt as an API approver. Note that bgrant0607 is an approver, but 2017-08-23 11:32:05 -07:00