github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_expapi_desc' of https://github.com/markturansky/kubernetes into markturansky-fix_expapi_desc

Browse Source
This commit is contained in:
Brendan Burns
2015-09-02 21:36:40 -07:00
parent d1e1615967 8f9444025f
commit a064c5d933
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/expapi/types.go
View File

@@ -355,7 +355,9 @@ type DaemonList struct {
type ThirdPartyResourceDataList struct {
api.TypeMeta `json:",inline"`
api.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
api.ListMeta `json:"metadata,omitempty"`
// Items is a list of third party objects
Items []ThirdPartyResourceData `json:"items"`
}