github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22785 from wojtek-t/fix_resthandler_test

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-14 08:32:58 -07:00
commit b26d6cb706
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/apiserver/resthandler_test.go
View File

@ -38,10 +38,12 @@ import (
type testPatchType struct { type testPatchType struct {
unversioned.TypeMeta `json:",inline"` unversioned.TypeMeta `json:",inline"`
testPatchSubType `json:",inline"` TestPatchSubType `json:",inline"`
} }
type testPatchSubType struct { // We explicitly make it public as private types doesn't
// work correctly with json inlined types.
type TestPatchSubType struct {
StringField string `json:"theField"` StringField string `json:"theField"`
} }