Merge pull request #13780 from smarterclayton/pod_logs

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-09-21 17:02:47 -07:00
32 changed files with 768 additions and 103 deletions

View File

@@ -1450,6 +1450,33 @@ func deepCopy_v1_PodLogOptions(in PodLogOptions, out *PodLogOptions, c *conversi
out.Container = in.Container
out.Follow = in.Follow
out.Previous = in.Previous
if in.SinceSeconds != nil {
out.SinceSeconds = new(int64)
*out.SinceSeconds = *in.SinceSeconds
} else {
out.SinceSeconds = nil
}
if in.SinceTime != nil {
out.SinceTime = new(unversioned.Time)
if err := deepCopy_unversioned_Time(*in.SinceTime, out.SinceTime, c); err != nil {
return err
}
} else {
out.SinceTime = nil
}
out.Timestamps = in.Timestamps
if in.TailLines != nil {
out.TailLines = new(int64)
*out.TailLines = *in.TailLines
} else {
out.TailLines = nil
}
if in.LimitBytes != nil {
out.LimitBytes = new(int64)
*out.LimitBytes = *in.LimitBytes
} else {
out.LimitBytes = nil
}
return nil
}