Merge pull request #12957 from smarterclayton/handle_terminating_pods

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-08-20 21:47:00 -07:00
47 changed files with 561 additions and 94 deletions

View File

@@ -1011,6 +1011,12 @@ func deepCopy_api_ObjectMeta(in ObjectMeta, out *ObjectMeta, c *conversion.Clone
} else {
out.DeletionTimestamp = nil
}
if in.DeletionGracePeriodSeconds != nil {
out.DeletionGracePeriodSeconds = new(int64)
*out.DeletionGracePeriodSeconds = *in.DeletionGracePeriodSeconds
} else {
out.DeletionGracePeriodSeconds = nil
}
if in.Labels != nil {
out.Labels = make(map[string]string)
for key, val := range in.Labels {