Merge pull request #18409 from deads2k/flake-01-testversion

Automatic merge from submit-queue (batch tested with PRs 18393, 18409). UPSTREAM: 58994: Race condition between listener and client in remote… …_runtime_test picks kubernetes/kubernetes#58994 fixes #17757
openshift · Feb 2, 2018 · 4f13268 · 4f13268
2 parents 810dc7b + 6bb94b1
commit 4f13268
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/remote/BUILD b/vendor/k8s.io/kubernetes/pkg/kubelet/remote/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/remote/fake/fake_runtime.go b/vendor/k8s.io/kubernetes/pkg/kubelet/remote/fake/fake_runtime.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/remote/remote_runtime_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/remote/remote_runtime_test.go