From a8364d0c469fe2c4abca80e1f488e6cff6609dbd Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Tue, 28 Jun 2016 22:16:27 -0700 Subject: [PATCH] Move hacked golang http code to forked/ dir --- pkg/util/httpstream/spdy/roundtripper.go | 2 +- pkg/util/proxy/dial.go | 2 +- third_party/{golang => forked}/netutil/addr.go | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename third_party/{golang => forked}/netutil/addr.go (100%) diff --git a/pkg/util/httpstream/spdy/roundtripper.go b/pkg/util/httpstream/spdy/roundtripper.go index 6091c4e4b10..49fd43b0945 100644 --- a/pkg/util/httpstream/spdy/roundtripper.go +++ b/pkg/util/httpstream/spdy/roundtripper.go @@ -32,7 +32,7 @@ import ( apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/unversioned" "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 diff --git a/pkg/util/proxy/dial.go b/pkg/util/proxy/dial.go index 33cecb7ea1c..d1b5dda4d38 100644 --- a/pkg/util/proxy/dial.go +++ b/pkg/util/proxy/dial.go @@ -26,7 +26,7 @@ import ( "github.com/golang/glog" 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) { diff --git a/third_party/golang/netutil/addr.go b/third_party/forked/netutil/addr.go similarity index 100% rename from third_party/golang/netutil/addr.go rename to third_party/forked/netutil/addr.go