From f8da06917ee1b9de4067583e6e87766478c97a4d Mon Sep 17 00:00:00 2001 From: David Calavera Date: Tue, 29 Dec 2015 19:27:12 -0500 Subject: [PATCH] Remove usage of pkg sockets and tlsconfig. - Use the ones provided by docker/go-connections, they are a drop in replacement. - Remove pkg/sockets from docker. - Keep pkg/tlsconfig because libnetwork still needs it and there is a circular dependency issue. Signed-off-by: David Calavera Upstream-commit: 96832973488c4860de407bb3c0b6226cf7a1c4c4 Component: cli --- components/cli/common.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cli/common.go b/components/cli/common.go index a1f3646d84..1ece1fb616 100644 --- a/components/cli/common.go +++ b/components/cli/common.go @@ -2,7 +2,7 @@ package cli import ( flag "github.com/docker/docker/pkg/mflag" - "github.com/docker/docker/pkg/tlsconfig" + "github.com/docker/go-connections/tlsconfig" ) // CommonFlags represents flags that are common to both the client and the daemon.