Skip to content

Commit

Permalink
Move boltdb/bolt to go.etcd.io/bbolt.
Browse files Browse the repository at this point in the history
Signed-off-by: John Howard <jhoward@microsoft.com>
  • Loading branch information
John Howard committed Sep 14, 2018
1 parent 50c60e7 commit ea4b457
Show file tree
Hide file tree
Showing 34 changed files with 672 additions and 323 deletions.
2 changes: 1 addition & 1 deletion agent/config.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package agent

import (
"github.com/boltdb/bolt"
"github.com/docker/go-events"
"github.com/docker/swarmkit/agent/exec"
"github.com/docker/swarmkit/api"
"github.com/docker/swarmkit/connectionbroker"
"github.com/pkg/errors"
bolt "go.etcd.io/bbolt"
"google.golang.org/grpc/credentials"
)

Expand Down
2 changes: 1 addition & 1 deletion agent/storage.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package agent

import (
"github.com/boltdb/bolt"
"github.com/docker/swarmkit/api"
"github.com/gogo/protobuf/proto"
bolt "go.etcd.io/bbolt"
)

// Layout:
Expand Down
2 changes: 1 addition & 1 deletion agent/storage_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"sort"
"testing"

"github.com/boltdb/bolt"
"github.com/docker/swarmkit/api"
"github.com/docker/swarmkit/identity"
"github.com/stretchr/testify/assert"
bolt "go.etcd.io/bbolt"
)

func TestStorageInit(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion agent/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package agent
import (
"sync"

"github.com/boltdb/bolt"
"github.com/docker/swarmkit/agent/exec"
"github.com/docker/swarmkit/api"
"github.com/docker/swarmkit/log"
"github.com/docker/swarmkit/watch"
"github.com/sirupsen/logrus"
bolt "go.etcd.io/bbolt"
"golang.org/x/net/context"
)

Expand Down
2 changes: 1 addition & 1 deletion agent/worker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package agent
import (
"testing"

"github.com/boltdb/bolt"
"github.com/docker/swarmkit/agent/exec"
"github.com/docker/swarmkit/api"
"github.com/docker/swarmkit/log"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
bolt "go.etcd.io/bbolt"
"golang.org/x/net/context"
)

Expand Down
2 changes: 1 addition & 1 deletion node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"github.com/docker/swarmkit/ca/keyutils"
"github.com/docker/swarmkit/identity"

"github.com/boltdb/bolt"
"github.com/docker/docker/pkg/plugingetter"
metrics "github.com/docker/go-metrics"
"github.com/docker/swarmkit/agent"
Expand All @@ -35,6 +34,7 @@ import (
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
bolt "go.etcd.io/bbolt"
"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
Expand Down
2 changes: 1 addition & 1 deletion vendor.conf
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76 # v1.1.0
github.com/Microsoft/go-winio v0.4.8
github.com/sirupsen/logrus v1.0.3
github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
github.com/boltdb/bolt fff57c100f4dea1905678da7e90d92429dff2904
github.com/cloudflare/cfssl 1.3.2
github.com/dustin/go-humanize 8929fe90cee4b2cb9deb468b51fb34eba64d1bf0
github.com/fernet/fernet-go 1b2437bc582b3cfbb341ee5a29f8ef5b42912ff2
Expand All @@ -60,6 +59,7 @@ github.com/rcrowley/go-metrics 51425a2415d21afadfd55cd93432c0bc69e9598d
github.com/spf13/cobra 8e91712f174ced10270cf66615e0a9127e7c4de5
github.com/spf13/pflag 7f60f83a2c81bc3c3c0d5297f61ddfa68da9d3b7
github.com/stretchr/testify v1.1.4
go.etcd.io/bbolt v1.3.1-etcd.8
golang.org/x/crypto 1a580b3eff7814fc9b40602fd35256c63b50f491
golang.org/x/net 0ed95abb35c445290478a5348a7b38bb154135fd
golang.org/x/sys 37707fdb30a5b38865cfb95e5aab41707daec7fd
Expand Down
File renamed without changes.

Large diffs are not rendered by default.

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

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

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

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

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

12 changes: 12 additions & 0 deletions vendor/go.etcd.io/bbolt/bolt_mips64x.go

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

12 changes: 12 additions & 0 deletions vendor/go.etcd.io/bbolt/bolt_mipsx.go

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

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

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

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

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

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

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

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

Loading

0 comments on commit ea4b457

Please sign in to comment.