diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-09-08 15:50:56 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-09-08 15:50:56 +0200 |
| commit | 7f54706b95beb033820924e77e18f21f241d223e (patch) | |
| tree | 26fc26ebb80e15a1ca64edd03efc9fac758274d0 /src/model/s3 | |
| parent | 907054775dc71a10a92ab96112889db9113130ab (diff) | |
| parent | d9d199a6c9c0ae2a6ee2b04103c78ef1eb311956 (diff) | |
| download | garage-7f54706b95beb033820924e77e18f21f241d223e.tar.gz garage-7f54706b95beb033820924e77e18f21f241d223e.zip | |
Merge branch 'lx-perf-improvements' into netapp-stream-body
Diffstat (limited to 'src/model/s3')
| -rw-r--r-- | src/model/s3/object_table.rs | 2 | ||||
| -rw-r--r-- | src/model/s3/version_table.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/model/s3/object_table.rs b/src/model/s3/object_table.rs index a3914c36..a151f1b1 100644 --- a/src/model/s3/object_table.rs +++ b/src/model/s3/object_table.rs @@ -14,7 +14,7 @@ use garage_table::*; use crate::index_counter::*; use crate::s3::version_table::*; -use garage_model_050::object_table as old; +use crate::prev::v051::object_table as old; pub const OBJECTS: &str = "objects"; pub const UNFINISHED_UPLOADS: &str = "unfinished_uploads"; diff --git a/src/model/s3/version_table.rs b/src/model/s3/version_table.rs index 881c245a..b545e66a 100644 --- a/src/model/s3/version_table.rs +++ b/src/model/s3/version_table.rs @@ -12,7 +12,7 @@ use garage_table::*; use crate::s3::block_ref_table::*; -use garage_model_050::version_table as old; +use crate::prev::v051::version_table as old; /// A version of an object #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)] |