UPSTREAM: 10647 (carry until 10656): increase Kubelet timeouts to 1 hour

This makes the Kubelet's read and write timeouts match the master. 10647 isn't going to be merged. Instead, 10656 will finer-grained timeouts based on the type of request, but it's not merged upstream yet. Once 10656 is merged, we can drop this patch.
openshift · Jul 17, 2015 · 46f9bb3 · 46f9bb3
1 parent fd9b930
commit 46f9bb3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/server.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/server.go