Merge pull request #22785 from wojtek-t/fix_resthandler_test

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-14 08:32:58 -07:00
commit b26d6cb706

View File

@ -38,10 +38,12 @@ import (
type testPatchType struct {
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"`
}