Merge pull request #18981 from calavera/stop_using_sockets_package

Remove pkg sockets and tlsconfig.
This commit is contained in:
Brian Goff 2015-12-29 22:22:11 -05:00
commit f2158e3920
3 changed files with 3 additions and 3 deletions

View file

@ -23,8 +23,8 @@ import (
"github.com/docker/distribution/registry/client/transport" "github.com/docker/distribution/registry/client/transport"
"github.com/docker/docker/dockerversion" "github.com/docker/docker/dockerversion"
"github.com/docker/docker/pkg/parsers/kernel" "github.com/docker/docker/pkg/parsers/kernel"
"github.com/docker/docker/pkg/tlsconfig"
"github.com/docker/docker/pkg/useragent" "github.com/docker/docker/pkg/useragent"
"github.com/docker/go-connections/tlsconfig"
) )
var ( var (

View file

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/docker/docker/pkg/tlsconfig"
"github.com/docker/docker/reference" "github.com/docker/docker/reference"
"github.com/docker/go-connections/tlsconfig"
) )
func (s *Service) lookupV1Endpoints(repoName reference.Named) (endpoints []APIEndpoint, err error) { func (s *Service) lookupV1Endpoints(repoName reference.Named) (endpoints []APIEndpoint, err error) {

View file

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/docker/docker/pkg/tlsconfig"
"github.com/docker/docker/reference" "github.com/docker/docker/reference"
"github.com/docker/go-connections/tlsconfig"
) )
func (s *Service) lookupV2Endpoints(repoName reference.Named) (endpoints []APIEndpoint, err error) { func (s *Service) lookupV2Endpoints(repoName reference.Named) (endpoints []APIEndpoint, err error) {