diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-30 15:54:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-30 15:54:36 +0200 |
| commit | cc22b94a7ab13c546e4b0c42024c13fe9d280b39 (patch) | |
| tree | fc1166cfc6d0efb6a3cf493bf563b032d7f39764 /libpod | |
| parent | 819375128741f0348b8e4ffd33a96c666e82ee4f (diff) | |
| parent | 366001fb5fa96b3b0f2f9e84b7ebc56dc4c94adc (diff) | |
| download | podman-cc22b94a7ab13c546e4b0c42024c13fe9d280b39.tar.gz podman-cc22b94a7ab13c546e4b0c42024c13fe9d280b39.tar.bz2 podman-cc22b94a7ab13c546e4b0c42024c13fe9d280b39.zip | |
Merge pull request #5602 from rhatdan/vendor
Update vendor of boltdb and containers/image
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/boltdb_state.go | 2 | ||||
| -rw-r--r-- | libpod/boltdb_state_internal.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go index 34ca7f740..4b6ff2c1d 100644 --- a/libpod/boltdb_state.go +++ b/libpod/boltdb_state.go @@ -7,10 +7,10 @@ import ( "sync" "github.com/containers/libpod/libpod/define" - bolt "github.com/etcd-io/bbolt" jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" "github.com/sirupsen/logrus" + bolt "go.etcd.io/bbolt" ) var json = jsoniter.ConfigCompatibleWithStandardLibrary diff --git a/libpod/boltdb_state_internal.go b/libpod/boltdb_state_internal.go index 6e1f2a5f2..33ff0720f 100644 --- a/libpod/boltdb_state_internal.go +++ b/libpod/boltdb_state_internal.go @@ -9,9 +9,9 @@ import ( "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/rootless" "github.com/containers/storage" - bolt "github.com/etcd-io/bbolt" "github.com/pkg/errors" "github.com/sirupsen/logrus" + bolt "go.etcd.io/bbolt" ) const ( |