Rename package timeout to timeoutconn.
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>master
							parent
							
								
									ec7ed3eefd
								
							
						
					
					
						commit
						d3ad1c3cbb
					
				| 
						 | 
				
			
			@ -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
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue