vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into postupload-endpoints-header

Browse source 
Conflicts:
	server.go
This commit is contained in:
Guillaume J. Charmes 2013-06-14 11:50:58 -07:00
commit 95606a4363
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/registry.go
View file

@ -478,10 +478,7 @@ type Registry struct {
authConfig *auth.AuthConfig authConfig *auth.AuthConfig
} }
func NewRegistry(root string) *Registry { func NewRegistry(root string, authConfig *auth.AuthConfig) *Registry {
// If the auth file does not exist, keep going
authConfig, _ := auth.LoadConfig(root)
httpTransport := &http.Transport{ httpTransport := &http.Transport{
DisableKeepAlives: true, DisableKeepAlives: true,
Proxy: http.ProxyFromEnvironment, Proxy: http.ProxyFromEnvironment,