Fix incorrect namespace variable name (merge conflict) (#1677)
This commit is contained in:
		| @@ -540,8 +540,8 @@ func (c *cmd) Before(ctx *cli.Context) error { | |||||||
| 	if len(ctx.String("auth_private_key")) > 0 { | 	if len(ctx.String("auth_private_key")) > 0 { | ||||||
| 		authOpts = append(authOpts, auth.PrivateKey(ctx.String("auth_private_key"))) | 		authOpts = append(authOpts, auth.PrivateKey(ctx.String("auth_private_key"))) | ||||||
| 	} | 	} | ||||||
| 	if len(ctx.String("service_namespace")) > 0 { | 	if len(ctx.String("auth_namespace")) > 0 { | ||||||
| 		authOpts = append(authOpts, auth.Namespace(ctx.String("service_namespace"))) | 		authOpts = append(authOpts, auth.Namespace(ctx.String("auth_namespace"))) | ||||||
| 	} | 	} | ||||||
| 	if name := ctx.String("auth_provider"); len(name) > 0 { | 	if name := ctx.String("auth_provider"); len(name) > 0 { | ||||||
| 		p, ok := DefaultAuthProviders[name] | 		p, ok := DefaultAuthProviders[name] | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user