Merge pull request #12007 from brendandburns/stdin

Auto commit by PR queue bot
2015-08-03 19:28:16 -07:00
parent d072cf804c 51757f6552
commit 3d2d99c6fd
8 changed files with 7046 additions and 8089 deletions
--- a/pkg/api/deep_copy_generated.go
+++ b/pkg/api/deep_copy_generated.go
@@ -204,6 +204,8 @@ func deepCopy_api_Container(in Container, out *Container, c *conversion.Cloner)
 	} else {
 		out.SecurityContext = nil
 	}
+	out.Stdin = in.Stdin
+	out.TTY = in.TTY
 	return nil
 }