Merge pull request #16244 from sjenning/pick-51644

Automatic merge from submit-queue (batch tested with PRs 15725, 16244, 15796, 16328, 16334) UPSTREAM: 51644: do not update init containers status if terminated kubernetes/kubernetes#51644 xref https://bugzilla.redhat.com/show_bug.cgi?id=1486356 @derekwaynecarr @bparees
openshift · Sep 15, 2017 · f35ae09 · f35ae09
2 parents 682fd1b + 1801d41
commit f35ae09
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go