Skip to content

Commit

Permalink
Merge pull request #51972 from jim-minter/producedObject
Browse files Browse the repository at this point in the history 
Automatic merge from submit-queue (batch tested with PRs 51067, 52319, 52803, 52961, 51972). 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>..

ProducesObject should only update the returned API object resource documentation

This should be a no-op for Kubernetes (the only rest.Storage that specifies ProducesObject() is pod logs, on GET), but will allow issues such as openshift/origin#8345 to be resolved (where generated API documentation is currently incorrect due to the asymmetry between the object kind sent and received by the API)

```release-note NONE```

Kubernetes-commit: 50fa5637b6dc9538c908fbdd632ff1d3c59f65da
  • Loading branch information
@k8s-publish-robot
k8s-publish-robot committed Oct 16, 2017
2 parents b32f4d5 + 4e1a340 commit 0f3e92f
Show file tree
Hide file tree
Showing 2 changed files with 160 additions and 108 deletions.
Loading

0 comments on commit 0f3e92f

Please sign in to comment.