Merge pull request #18487 from smarterclayton/guard_encode_decode

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-13 23:08:18 -08:00
25 changed files with 103 additions and 81 deletions

View File

@@ -275,7 +275,7 @@ func TestSetDefaultJob(t *testing.T) {
}
func roundTrip(t *testing.T, obj runtime.Object) runtime.Object {
data, err := Codec.Encode(obj)
data, err := runtime.Encode(Codec, obj)
if err != nil {
t.Errorf("%v\n %#v", err, obj)
return nil