Skip to content

Commit

Permalink
Merge 722cfcd into 0f3e57d
Browse files Browse the repository at this point in the history
  • Loading branch information
arekkas committed Apr 14, 2017
2 parents 0f3e57d + 722cfcd commit cbfc8b7
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 39 deletions.
66 changes: 33 additions & 33 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import:
version: ~0.11.0
- package: github.com/jmoiron/sqlx
- package: github.com/ory-am/common
version: ~0.0.1
version: ~0.4.0
subpackages:
- compiler
- pkg
Expand All @@ -14,10 +14,10 @@ import:
- package: golang.org/x/net
subpackages:
- context
- package: gopkg.in/dancannon/gorethink.v2
- package: gopkg.in/gorethink/gorethink.v3
version: ~3.0.0
- package: gopkg.in/redis.v5
version: ~5.1.6
- package: github.com/go-redis/redis
version: ~6.1.3
testImport:
- package: github.com/go-sql-driver/mysql
version: ~1.3.0
Expand Down
2 changes: 1 addition & 1 deletion manager_redis.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"

"github.com/pkg/errors"
"gopkg.in/redis.v5"
"github.com/go-redis/redis"
)

// RedisManager is a redis implementation of Manager to store policies persistently.
Expand Down
2 changes: 1 addition & 1 deletion manager_rethink.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"golang.org/x/net/context"
r "gopkg.in/dancannon/gorethink.v2"
r "gopkg.in/gorethink/gorethink.v3"
)

// stupid hack
Expand Down

0 comments on commit cbfc8b7

Please sign in to comment.