From 7e7646c28a599731e62afec4c0c4dc0942309b7f Mon Sep 17 00:00:00 2001 From: Rik Nijessen Date: Wed, 25 Feb 2015 20:52:37 +0100 Subject: [PATCH] Rename package timeout to timeoutconn. Signed-off-by: Rik Nijessen --- pkg/{timeout/timeout.go => timeoutconn/timeoutconn.go} | 2 +- .../timeout_test.go => timeoutconn/timeoutconn_test.go} | 2 +- registry/registry.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename pkg/{timeout/timeout.go => timeoutconn/timeoutconn.go} (95%) rename pkg/{timeout/timeout_test.go => timeoutconn/timeoutconn_test.go} (97%) diff --git a/pkg/timeout/timeout.go b/pkg/timeoutconn/timeoutconn.go similarity index 95% rename from pkg/timeout/timeout.go rename to pkg/timeoutconn/timeoutconn.go index be85ebdac8..3a554559a4 100644 --- a/pkg/timeout/timeout.go +++ b/pkg/timeoutconn/timeoutconn.go @@ -1,4 +1,4 @@ -package timeout +package timeoutconn import ( "net" diff --git a/pkg/timeout/timeout_test.go b/pkg/timeoutconn/timeoutconn_test.go similarity index 97% rename from pkg/timeout/timeout_test.go rename to pkg/timeoutconn/timeoutconn_test.go index f2bebae558..46d6477cce 100644 --- a/pkg/timeout/timeout_test.go +++ b/pkg/timeoutconn/timeoutconn_test.go @@ -1,4 +1,4 @@ -package timeout +package timeoutconn import ( "bufio" diff --git a/registry/registry.go b/registry/registry.go index ed57ed1a4b..a8bb83318d 100644 --- a/registry/registry.go +++ b/registry/registry.go @@ -14,7 +14,7 @@ import ( "time" log "github.com/Sirupsen/logrus" - "github.com/docker/docker/pkg/timeout" + "github.com/docker/docker/pkg/timeoutconn" ) var ( @@ -71,7 +71,7 @@ func newClient(jar http.CookieJar, roots *x509.CertPool, certs []tls.Certificate if err != nil { return nil, err } - conn = timeout.New(conn, 1*time.Minute) + conn = timeoutconn.New(conn, 1*time.Minute) return conn, nil } }