Merge pull request #202 from jhowardmsft/etcd-io-bbolt

boltdb/bolt is not maintained. Use bbolt instead.
docker · Sep 12, 2018 · 4589771 · 4589771
2 parents 791d3fc + da0a707
commit 4589771
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - 1.7.1
+  - 1.8.7
 
 # let us have speedy Docker-based Travis workers
 sudo: false
@@ -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 &

diff --git a/script/travis_zk.sh b/script/travis_zk.sh
@@ -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"

diff --git a/store/boltdb/boltdb.go b/store/boltdb/boltdb.go
@@ -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"
 )
 
 var (