Skip to content
Snippets Groups Projects
Unverified Commit 2bf728c6 authored by Márk Sági-Kazár's avatar Márk Sági-Kazár Committed by GitHub
Browse files

Merge pull request #1926 from dexidp/update-etcd-3.5

Update etcd to 3.5
parents 8e7ce635 356ccecc
No related branches found
No related tags found
No related merge requests found
......@@ -11,7 +11,6 @@ require (
github.com/ghodss/yaml v1.0.0
github.com/go-ldap/ldap/v3 v3.2.4
github.com/go-sql-driver/mysql v1.5.0
github.com/gogo/protobuf v1.3.1 // indirect
github.com/golang/protobuf v1.5.0
github.com/gorilla/handlers v1.5.1
github.com/gorilla/mux v1.8.0
......@@ -24,18 +23,19 @@ require (
github.com/onsi/ginkgo v1.8.0 // indirect
github.com/onsi/gomega v1.5.0 // indirect
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.4.0
github.com/prometheus/client_golang v1.5.1
github.com/russellhaering/goxmldsig v1.1.0
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.1.3
github.com/stretchr/testify v1.7.0
go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738
go.etcd.io/etcd/client/v3 v3.5.0-alpha.0
go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
golang.org/x/net v0.0.0-20201224014010-6772e930b67b
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5
golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3 // indirect
google.golang.org/api v0.15.0
google.golang.org/grpc v1.26.0
google.golang.org/api v0.35.0
google.golang.org/grpc v1.32.0
google.golang.org/protobuf v1.26.0
gopkg.in/square/go-jose.v2 v2.5.1
sigs.k8s.io/testing_frameworks v0.1.2
......
This diff is collapsed.
......@@ -3,9 +3,9 @@ package etcd
import (
"time"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/clientv3/namespace"
"go.etcd.io/etcd/pkg/transport"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/namespace"
"go.etcd.io/etcd/pkg/v3/transport"
"github.com/dexidp/dex/pkg/log"
"github.com/dexidp/dex/storage"
......
......@@ -7,7 +7,7 @@ import (
"strings"
"time"
"go.etcd.io/etcd/clientv3"
clientv3 "go.etcd.io/etcd/client/v3"
"github.com/dexidp/dex/pkg/log"
"github.com/dexidp/dex/storage"
......
......@@ -10,7 +10,7 @@ import (
"time"
"github.com/sirupsen/logrus"
"go.etcd.io/etcd/clientv3"
clientv3 "go.etcd.io/etcd/client/v3"
"github.com/dexidp/dex/storage"
"github.com/dexidp/dex/storage/conformance"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment