Skip to content

Commit

Permalink
Merge pull request kubernetes#44037 from dims/update-boltdb-dependency
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 44047, 43514, 44037, 43467)

Update boltdb dependency to fix golang 1.7 intermittent failures

We have a old boltdb/bolt, etcd has moved to newer boltdb, so we should
do the same. Specifically this change needs to be in our tree:
boltdb/bolt@92410e0

as this fixes intermittent issues we see in our CI runs. So in this
PR, we vendor the v1.3.0 version of boltdb/bolt.

Fixes kubernetes#43973
  • Loading branch information
Kubernetes Submit Queue authored Apr 4, 2017
2 parents 89875cc + 29e4031 commit 617464b
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Godeps/Godeps.json

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

2 changes: 1 addition & 1 deletion staging/src/k8s.io/apiserver/Godeps/Godeps.json

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

12 changes: 7 additions & 5 deletions vendor/github.com/boltdb/bolt/README.md

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

18 changes: 12 additions & 6 deletions vendor/github.com/boltdb/bolt/freelist.go

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

5 changes: 5 additions & 0 deletions vendor/github.com/boltdb/bolt/node.go

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

6 changes: 6 additions & 0 deletions vendor/github.com/boltdb/bolt/page.go

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

0 comments on commit 617464b

Please sign in to comment.