Merge pull request #17099 from feihujiang/moveDefaultingFuncsFromInternalToV1

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-01 07:13:26 -08:00
4 changed files with 19 additions and 11 deletions

View File

@@ -39,15 +39,6 @@ func init() {
obj.FieldSelector = unversioned.FieldSelector{fields.Everything()}
}
},
// TODO: see about moving this into v1/defaults.go
func(obj *PodExecOptions) {
obj.Stderr = true
obj.Stdout = true
},
func(obj *PodAttachOptions) {
obj.Stderr = true
obj.Stdout = true
},
)
Scheme.AddConversionFuncs(
func(in *unversioned.Time, out *unversioned.Time, s conversion.Scope) error {