From 967da32c2842ca7f80ba16a6bfd530072c85533e Mon Sep 17 00:00:00 2001
From: Rik Nijessen <rik@keefo.nl>
Date: Wed, 25 Feb 2015 20:52:37 +0100
Subject: [PATCH] Rename package timeout to timeoutconn.

Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
Upstream-commit: 7e7646c28a599731e62afec4c0c4dc0942309b7f
Component: engine
---
 .../pkg/{timeout/timeout.go => timeoutconn/timeoutconn.go}    | 2 +-
 .../timeout_test.go => timeoutconn/timeoutconn_test.go}       | 2 +-
 components/engine/registry/registry.go                        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename components/engine/pkg/{timeout/timeout.go => timeoutconn/timeoutconn.go} (95%)
 rename components/engine/pkg/{timeout/timeout_test.go => timeoutconn/timeoutconn_test.go} (97%)

diff --git a/components/engine/pkg/timeout/timeout.go b/components/engine/pkg/timeoutconn/timeoutconn.go
similarity index 95%
rename from components/engine/pkg/timeout/timeout.go
rename to components/engine/pkg/timeoutconn/timeoutconn.go
index be85ebdac8..3a554559a4 100644
--- a/components/engine/pkg/timeout/timeout.go
+++ b/components/engine/pkg/timeoutconn/timeoutconn.go
@@ -1,4 +1,4 @@
-package timeout
+package timeoutconn
 
 import (
 	"net"
diff --git a/components/engine/pkg/timeout/timeout_test.go b/components/engine/pkg/timeoutconn/timeoutconn_test.go
similarity index 97%
rename from components/engine/pkg/timeout/timeout_test.go
rename to components/engine/pkg/timeoutconn/timeoutconn_test.go
index f2bebae558..46d6477cce 100644
--- a/components/engine/pkg/timeout/timeout_test.go
+++ b/components/engine/pkg/timeoutconn/timeoutconn_test.go
@@ -1,4 +1,4 @@
-package timeout
+package timeoutconn
 
 import (
 	"bufio"
diff --git a/components/engine/registry/registry.go b/components/engine/registry/registry.go
index ed57ed1a4b..a8bb83318d 100644
--- a/components/engine/registry/registry.go
+++ b/components/engine/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
 		}
 	}