From fcfe1f12e1c9fb834ac0e68e7771dbfc0e773e4f Mon Sep 17 00:00:00 2001 From: CMogilko Date: Thu, 19 Mar 2020 13:25:25 +0300 Subject: [PATCH] Revert backoff v4 -> v2 (#485) --- CHANGELOG.md | 6 +++++- README.md | 2 +- cluster.go | 2 +- go.mod | 5 +---- go.sum | 2 ++ 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8076c26d..4fb7a227 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## v6.2.0 - 2020-03-16 +## v6.2.1 - 2020-03-19 + +- Revert backoff v4 for gopath compatibility + +## v6.2.0 - 2020-03-18 - Backoff v4 - Reworked cluster discovery diff --git a/README.md b/README.md index 366c3777..2fa4661e 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ![RethinkDB-go Logo](https://raw.github.com/wiki/rethinkdb/rethinkdb-go/gopher-and-thinker-s.png "Golang Gopher and RethinkDB Thinker") -Current version: v6.2.0 (RethinkDB v2.4) +Current version: v6.2.1 (RethinkDB v2.4) Please note that this version of the driver only supports versions of RethinkDB using the v0.4 protocol (any versions of the driver older than RethinkDB 2.0 will not work). diff --git a/cluster.go b/cluster.go index 9b2d2e64..00f664dc 100644 --- a/cluster.go +++ b/cluster.go @@ -12,7 +12,7 @@ import ( "github.com/hailocab/go-hostpool" "github.com/sirupsen/logrus" "golang.org/x/net/context" - "gopkg.in/cenkalti/backoff.v4" + "gopkg.in/cenkalti/backoff.v2" ) var errClusterClosed = errors.New("rethinkdb: cluster is closed") diff --git a/go.mod b/go.mod index 862f3ac0..db649f05 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module gopkg.in/rethinkdb/rethinkdb-go.v6 require ( github.com/bitly/go-hostpool v0.1.0 // indirect github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect - gopkg.in/cenkalti/backoff.v4 v4.0.0 github.com/golang/protobuf v1.3.4 github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed github.com/kr/pretty v0.1.0 // indirect @@ -18,12 +17,10 @@ require ( golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect + gopkg.in/cenkalti/backoff.v2 v2.2.1 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect gopkg.in/yaml.v2 v2.2.8 // indirect ) -// gopath support -replace gopkg.in/cenkalti/backoff.v4 v4.0.0 => github.com/cenkalti/backoff/v4 v4.0.0 - go 1.14 diff --git a/go.sum b/go.sum index ec37ade4..cfaab5c0 100644 --- a/go.sum +++ b/go.sum @@ -62,6 +62,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+y golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= +gopkg.in/cenkalti/backoff.v2 v2.2.1 h1:eJ9UAg01/HIHG987TwxvnzK2MgxXq97YY6rYDpY9aII= +gopkg.in/cenkalti/backoff.v2 v2.2.1/go.mod h1:S0QdOvT2AlerfSBkp0O+dk+bbIMaNbEmVk876gPCthU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=