Merge pull request #16633 from sjenning/pick-53318

Automatic merge from submit-queue. UPSTREAM: 53318: create separate transports for liveness and readiness probes kubernetes/kubernetes#53318 xref https://bugzilla.redhat.com/show_bug.cgi?id=1454858 @smarterclayton @derekwaynecarr
openshift · Oct 3, 2017 · afd90cd · afd90cd
2 parents 96ad56a + d594e68
commit afd90cd
Showing 1 changed file with 24 additions and 15 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/prober/prober.go b/vendor/k8s.io/kubernetes/pkg/kubelet/prober/prober.go