From 9ee5e3c80391bd1af22697a846b4ac36cc994da6 Mon Sep 17 00:00:00 2001
From: "Aeneas Rekkas (arekkas)" <aeneas@ory.am>
Date: Fri, 14 Apr 2017 17:40:50 +0200
Subject: [PATCH] vendor: update redis imports

---
 client/manager_redis.go       |  2 +-
 config/backend_connections.go |  2 +-
 glide.lock                    | 12 ++----------
 glide.yaml                    |  4 ++--
 integration/docker.go         |  2 +-
 jwk/manager_redis.go          |  2 +-
 oauth2/fosite_store_redis.go  |  2 +-
 7 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/client/manager_redis.go b/client/manager_redis.go
index 5a0508d23f..31784ea7ec 100644
--- a/client/manager_redis.go
+++ b/client/manager_redis.go
@@ -8,7 +8,7 @@ import (
 	"github.com/ory-am/hydra/pkg"
 	"github.com/pborman/uuid"
 	"github.com/pkg/errors"
-	"gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 )
 
 type RedisManager struct {
diff --git a/config/backend_connections.go b/config/backend_connections.go
index d6a0bad779..c3433c2dcf 100644
--- a/config/backend_connections.go
+++ b/config/backend_connections.go
@@ -17,7 +17,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 	r "gopkg.in/gorethink/gorethink.v3"
-	"gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 	"strings"
 )
 
diff --git a/glide.lock b/glide.lock
index 49b42e13f1..48a4939b96 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 392a6868a591cdd45ea1edc5454cd85f46357bdb02c765af64cdeab7c3531f70
-updated: 2017-04-14T11:48:54.5981025+02:00
+hash: 26dc5b3174bda540fc13d9559300387ce0a6c31228f4d687243504cb961459fb
+updated: 2017-04-14T17:39:19.4443314+02:00
 imports:
 - name: github.com/asaskevich/govalidator
   version: 7b3beb6df3c42abd3509abfc3bcacc0fbfb7c877
@@ -237,14 +237,6 @@ imports:
   version: c87af80f3cc5036b55b83d77171e156791085e2e
 - name: gopkg.in/ory-am/dockertest.v3
   version: e4828e807797a7641fcd457716870dfc2f9e82ff
-- name: gopkg.in/redis.v5
-  version: a16aeec10ff407b1e7be6dd35797ccf5426ef0f0
-  subpackages:
-  - internal
-  - internal/consistenthash
-  - internal/hashtag
-  - internal/pool
-  - internal/proto
 - name: gopkg.in/square/go-jose.v1
   version: aa2e30fdd1fe9dd3394119af66451ae790d50e0d
   subpackages:
diff --git a/glide.yaml b/glide.yaml
index 27f6eaff29..495b5bf8a6 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -59,8 +59,8 @@ import:
   - clientcredentials
 - package: gopkg.in/dancannon/gorethink.v2
   version: ~3.0.0
-- package: gopkg.in/redis.v5
-  version: ^5.1.2
+- package: github.com/go-redis/redis
+  version: ^6.1.3
 - package: gopkg.in/tylerb/graceful.v1
   version: ^1.2.13
 - package: gopkg.in/yaml.v2
diff --git a/integration/docker.go b/integration/docker.go
index 78f4a4c6b5..d9a3dab72b 100644
--- a/integration/docker.go
+++ b/integration/docker.go
@@ -10,7 +10,7 @@ import (
 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq"
 	"gopkg.in/ory-am/dockertest.v3"
-	"gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 )
 
 var resources []*dockertest.Resource
diff --git a/jwk/manager_redis.go b/jwk/manager_redis.go
index 9b183c7bf1..014a15e0e5 100644
--- a/jwk/manager_redis.go
+++ b/jwk/manager_redis.go
@@ -7,7 +7,7 @@ import (
 	"github.com/ory-am/hydra/pkg"
 	"github.com/pkg/errors"
 	"github.com/square/go-jose"
-	"gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 )
 
 type RedisManager struct {
diff --git a/oauth2/fosite_store_redis.go b/oauth2/fosite_store_redis.go
index 186855c8e4..72e4f816d8 100644
--- a/oauth2/fosite_store_redis.go
+++ b/oauth2/fosite_store_redis.go
@@ -10,7 +10,7 @@ import (
 	"github.com/ory-am/hydra/client"
 	"github.com/pkg/errors"
 	"golang.org/x/net/context"
-	"gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 )
 
 type FositeRedisStore struct {