diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-05-21 15:54:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21 15:54:26 -0400 |
| commit | cec56b0075eeec6a8cdfba3138dec32fdcd36b47 (patch) | |
| tree | 6b129e2b8f58e0a46b8d25cd4459bb6e3c9436f7 /libpod | |
| parent | e6277b1a2dedf8a4d80a270ddac0be4c22ed3e6d (diff) | |
| parent | 1d505f6875d27dccafb777853a51045f82888f00 (diff) | |
| download | podman-cec56b0075eeec6a8cdfba3138dec32fdcd36b47.tar.gz podman-cec56b0075eeec6a8cdfba3138dec32fdcd36b47.tar.bz2 podman-cec56b0075eeec6a8cdfba3138dec32fdcd36b47.zip | |
Merge pull request #3168 from rhatdan/vendor
Update vendor of buildah and containers/images
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 d8cfa2bda..63e40a98f 100644 --- a/libpod/boltdb_state.go +++ b/libpod/boltdb_state.go @@ -5,7 +5,7 @@ import ( "strings" "sync" - "github.com/boltdb/bolt" + bolt "github.com/etcd-io/bbolt" jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/libpod/boltdb_state_internal.go b/libpod/boltdb_state_internal.go index a6900a6d3..313e5f4d7 100644 --- a/libpod/boltdb_state_internal.go +++ b/libpod/boltdb_state_internal.go @@ -5,9 +5,9 @@ import ( "runtime" "strings" - "github.com/boltdb/bolt" "github.com/containers/libpod/pkg/rootless" "github.com/containers/storage" + bolt "github.com/etcd-io/bbolt" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) |