Merge pull request #1539 from erwinvaneyk/replace-context-import
Replace x/net/context with stdlib context
This commit is contained in:
commit
c854e760db
1 changed files with 1 additions and 4 deletions
|
@ -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"
|
||||||
|
|
Reference in a new issue