Merge branch 'master' into postupload-endpoints-header

Conflicts: server.go
2013-06-14 11:50:58 -07:00 · 2013-06-14 11:50:58 -07:00 · 95606a4363
parent ca71aa4f8d 7c76c4689d
commit 95606a4363
1 changed files with 1 additions and 4 deletions
--- a/docs/registry.go
+++ b/docs/registry.go
@ -478,10 +478,7 @@ type Registry struct {
 	authConfig *auth.AuthConfig
 }

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