Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

boltdb/bolt is not maintained. Use bbolt instead. #202

Merged
merged 3 commits into from
Sep 12, 2018
Merged

boltdb/bolt is not maintained. Use bbolt instead. #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21faf8e
boltdb/bolt is not maintained. Used bbolt
Sep 11, 2018
b5f9fc3
Bump travis to go 1.8.x
Sep 11, 2018
da0a707
Bump zookeeper to 3.5.4 (old versions no longer exist)
Sep 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: go

go:
- 1.7.1
- 1.8.7

# let us have speedy Docker-based Travis workers
sudo: false
Expand All @@ -17,7 +17,7 @@ before_install:
before_script:
- script/travis_consul.sh 0.6.3
- script/travis_etcd.sh 3.0.0
- script/travis_zk.sh 3.5.1-alpha
- script/travis_zk.sh 3.5.4-beta

script:
- ./consul agent -server -bootstrap -advertise=127.0.0.1 -data-dir /tmp/consul -config-file=./config.json 1>/dev/null &
Expand Down
2 changes: 1 addition & 1 deletion script/travis_zk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
if [ $# -gt 0 ] ; then
ZK_VERSION="$1"
else
ZK_VERSION="3.4.7"
ZK_VERSION="3.5.4-beta"
fi

wget "http://apache.cs.utah.edu/zookeeper/zookeeper-${ZK_VERSION}/zookeeper-${ZK_VERSION}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion store/boltdb/boltdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"sync/atomic"
"time"

"github.com/boltdb/bolt"
"github.com/docker/libkv"
"github.com/docker/libkv/store"
bolt "go.etcd.io/bbolt"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Was the alias needed? I think it worked without

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, the package name in the new repo is bbolt, not bolt. I'm following the import recommendation at https://github.com/etcd-io/bbolt#installing

)

var (
Expand Down