scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 12:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13575 from mikedanese/description-tag

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-09-04 10:33:57 -07:00
parent de3cf9b712 8a2e430b1d
commit aff690bdee
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/expapi/v1/types.go
View File

@@ -343,7 +343,10 @@ type DaemonList struct {
type ThirdPartyResourceDataList struct { type ThirdPartyResourceDataList struct {
v1.TypeMeta `json:",inline"` v1.TypeMeta `json:",inline"`
v1.ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://docs.k8s.io/api-conventions.md#metadata"` // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
v1.ListMeta `json:"metadata,omitempty"`
Items []ThirdPartyResourceData `json:"items" description:"items is a list of third party objects"` // Items is a list of third party objects
Items []ThirdPartyResourceData `json:"items"`
} }

9
pkg/expapi/v1/types_swagger_doc_generated.go
View File

@@ -260,6 +260,15 @@ func (ThirdPartyResourceData) SwaggerDoc() map[string]string {
return map_ThirdPartyResourceData return map_ThirdPartyResourceData
} }
var map_ThirdPartyResourceDataList = map[string]string{
"metadata": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
"items": "Items is a list of third party objects",
}
func (ThirdPartyResourceDataList) SwaggerDoc() map[string]string {
return map_ThirdPartyResourceDataList
}
var map_ThirdPartyResourceList = map[string]string{ var map_ThirdPartyResourceList = map[string]string{
"metadata": "Standard list metadata.", "metadata": "Standard list metadata.",
"items": "Items is the list of horizontal pod autoscalers.", "items": "Items is the list of horizontal pod autoscalers.",