github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move hacked golang http code to forked/ dir

Browse Source
This commit is contained in:
Tim Hockin
2016-06-28 22:16:27 -07:00
parent 37bda2dbf2
commit a8364d0c46
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/util/httpstream/spdy/roundtripper.go
View File

@@ -32,7 +32,7 @@ import (
apierrors "k8s.io/kubernetes/pkg/api/errors" apierrors "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/util/httpstream" "k8s.io/kubernetes/pkg/util/httpstream"
"k8s.io/kubernetes/third_party/golang/netutil" "k8s.io/kubernetes/third_party/forked/netutil"
) )
// SpdyRoundTripper knows how to upgrade an HTTP request to one that supports // SpdyRoundTripper knows how to upgrade an HTTP request to one that supports

2
pkg/util/proxy/dial.go
View File

@@ -26,7 +26,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
utilnet "k8s.io/kubernetes/pkg/util/net" utilnet "k8s.io/kubernetes/pkg/util/net"
"k8s.io/kubernetes/third_party/golang/netutil" "k8s.io/kubernetes/third_party/forked/netutil"
) )
func DialURL(url *url.URL, transport http.RoundTripper) (net.Conn, error) { func DialURL(url *url.URL, transport http.RoundTripper) (net.Conn, error) {

0
third_party/golang/netutil/addr.go → third_party/forked/netutil/addr.go vendored
View File