diff options
| author | k8s-ci-robot <k8s-ci-robot@users.noreply.github.com> | 2018-01-08 12:42:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-08 12:42:10 -0800 |
| commit | d3ebc093cece3879f2a220cb537d89e1f03d8f47 (patch) | |
| tree | c87208135bf73dc5f6e3669fbfe4fb7a68d800f3 /hack | |
| parent | a982f3405787d972e89b28bd59e5dcb16621616f (diff) | |
| parent | b5f71cfe61747e8998a34cb4cedb4242f2d66ff6 (diff) | |
Merge pull request #1545 from nikhita/update-strategic-merge-patch
StrategicMergePatch: OpenAPI annotations are now allowed
Diffstat (limited to 'hack')
0 files changed, 0 insertions, 0 deletions