Merge pull request kubernetes#22785 from wojtek-t/fix_resthandler_test

Auto commit by PR queue bot
xfye · Mar 14, 2016 · b26d6cb · b26d6cb
2 parents 323f5c4 + 0e73783
commit b26d6cb
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pkg/apiserver/resthandler_test.go b/pkg/apiserver/resthandler_test.go
@@ -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"`
 }