diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-31 22:39:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 22:39:01 +0100 |
| commit | 95b2fd6c273ded741614665644c431a1c7831a70 (patch) | |
| tree | e09c845896ba74942de8ec13e4404df393f374a5 /libpod/boltdb_state.go | |
| parent | a15a20d3c5898017e1549028fd8960d421240918 (diff) | |
| parent | 28ad43940f3bfca3870a5450342c4b79c6a2f60f (diff) | |
| download | podman-95b2fd6c273ded741614665644c431a1c7831a70.tar.gz podman-95b2fd6c273ded741614665644c431a1c7831a70.tar.bz2 podman-95b2fd6c273ded741614665644c431a1c7831a70.zip | |
Merge pull request #4403 from mheon/cherrypick_163
Cherrypicks for v1.6.3 final
Diffstat (limited to 'libpod/boltdb_state.go')
| -rw-r--r-- | libpod/boltdb_state.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go index 0bb1df7b8..608a279c3 100644 --- a/libpod/boltdb_state.go +++ b/libpod/boltdb_state.go @@ -6,6 +6,7 @@ import ( "strings" "sync" + "github.com/containers/libpod/libpod/config" "github.com/containers/libpod/libpod/define" bolt "github.com/etcd-io/bbolt" jsoniter "github.com/json-iterator/go" @@ -291,12 +292,12 @@ func (s *BoltState) Refresh() error { // GetDBConfig retrieves runtime configuration fields that were created when // the database was first initialized -func (s *BoltState) GetDBConfig() (*DBConfig, error) { +func (s *BoltState) GetDBConfig() (*config.DBConfig, error) { if !s.valid { return nil, define.ErrDBClosed } - cfg := new(DBConfig) + cfg := new(config.DBConfig) db, err := s.getDBCon() if err != nil { |