Merge pull request #12007 from brendandburns/stdin

Auto commit by PR queue bot
This commit is contained in:
Alex Mohr
2015-08-03 19:28:16 -07:00
8 changed files with 7046 additions and 8089 deletions

View File

@@ -221,6 +221,8 @@ func convert_api_Container_To_v1_Container(in *api.Container, out *Container, s
} else {
out.SecurityContext = nil
}
out.Stdin = in.Stdin
out.TTY = in.TTY
return nil
}
@@ -2486,6 +2488,8 @@ func convert_v1_Container_To_api_Container(in *Container, out *api.Container, s
} else {
out.SecurityContext = nil
}
out.Stdin = in.Stdin
out.TTY = in.TTY
return nil
}