github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1580 from ghodss/fix_v1beta3_jsonbase_error

Browse Source 
Compilation error on HEAD: Remove JSONBase reference from v1beta3/types.go to prevent it
This commit is contained in:
bgrant0607
2014-10-03 19:07:37 -07:00
parent fd5a908070 3de1317c15
commit 2ac00df460
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/v1beta3/types.go
View File

@@ -836,7 +836,8 @@ type Event struct {
// EventList is a list of events. // EventList is a list of events.
type EventList struct { type EventList struct {
JSONBase `json:",inline" yaml:",inline"` TypeMeta `json:",inline" yaml:",inline"`
Metadata ListMeta `json:"metadata,inline" yaml:"metadata,inline"`
Items []Event `json:"items" yaml:"items"` Items []Event `json:"items" yaml:"items"`
} }