k-space/dex
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Activity

Merge pull request #1539 from erwinvaneyk/replace-context-import

Browse Source 
Replace x/net/context with stdlib context
This commit is contained in:
Stephan Renatus 2019-08-31 17:52:18 +02:00 committed by GitHub
commit c854e760db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/api.go
View File

@ -1,15 +1,12 @@
package server package server
import ( import (
"context"
"errors" "errors"
"fmt" "fmt"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
// go-grpc doesn't use the standard library's context.
// https://github.com/grpc/grpc-go/issues/711
"golang.org/x/net/context"
"github.com/dexidp/dex/api" "github.com/dexidp/dex/api"
"github.com/dexidp/dex/pkg/log" "github.com/dexidp/dex/pkg/log"
"github.com/dexidp/dex/server/internal" "github.com/dexidp/dex/server/internal"