github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update ContainerState.Termination to ContainerState.Terminated in pkg/api/types.go and pkg/api/v1/types.go

Browse Source
This commit is contained in:
Chao Xu
2015-05-27 15:02:11 -07:00
parent 677d0fdf87
commit 2f6e5e2e08
20 changed files with 217 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/v1/deep_copy_generated.go
View File

@@ -246,13 +246,13 @@ func deepCopy_v1_ContainerState(in ContainerState, out *ContainerState, c *conve
} else {
out.Running = nil
}
if in.Termination != nil {
out.Termination = new(ContainerStateTerminated)
if err := deepCopy_v1_ContainerStateTerminated(*in.Termination, out.Termination, c); err != nil {
if in.Terminated != nil {
out.Terminated = new(ContainerStateTerminated)
if err := deepCopy_v1_ContainerStateTerminated(*in.Terminated, out.Terminated, c); err != nil {
return err
}
} else {
out.Termination = nil
out.Terminated = nil
}
return nil
}