github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19334 from resouer/network

Browse Source 
Networking should be used to hold network related pkgs
This commit is contained in:
Alex Mohr
2016-01-21 10:26:13 -08:00
parent 8c9aa2af33 936a11e775
commit d2d349bc84
43 changed files with 687 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/client/unversioned/request.go
View File

@@ -40,7 +40,7 @@ import (
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/net"
"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/kubernetes/pkg/watch"
watchjson "k8s.io/kubernetes/pkg/watch/json"
@@ -641,7 +641,7 @@ func (r *Request) Watch() (watch.Interface, error) {
if err != nil {
// The watch stream mechanism handles many common partial data errors, so closed
// connections can be retried in many cases.
if util.IsProbableEOF(err) {
if net.IsProbableEOF(err) {
return watch.NewEmptyWatch(), nil
}
return nil, err