diff options
| author | Alex Auvolat <alex@adnab.me> | 2024-02-15 13:58:15 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2024-02-15 14:06:34 +0100 |
| commit | eb4a6ce1060a847be0b62c6a10ff3ba956e3f34d (patch) | |
| tree | 84f6746ec92ca3a5344da22edadcd1ac3413aa29 /src/api/s3 | |
| parent | cf2af186fcc0c8f581a966454b6cd4720d3821f0 (diff) | |
| parent | 7be3f15e45fcfff10a45302a040c2919a3ba8ccd (diff) | |
| download | garage-eb4a6ce1060a847be0b62c6a10ff3ba956e3f34d.tar.gz garage-eb4a6ce1060a847be0b62c6a10ff3ba956e3f34d.zip | |
Merge branch 'main' into next-0.10
Diffstat (limited to 'src/api/s3')
| -rw-r--r-- | src/api/s3/copy.rs | 2 | ||||
| -rw-r--r-- | src/api/s3/put.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/api/s3/copy.rs b/src/api/s3/copy.rs index ba9bfc88..7eb1fe60 100644 --- a/src/api/s3/copy.rs +++ b/src/api/s3/copy.rs @@ -9,7 +9,7 @@ use bytes::Bytes; use hyper::{Request, Response}; use serde::Serialize; -use garage_rpc::netapp::bytes_buf::BytesBuf; +use garage_net::bytes_buf::BytesBuf; use garage_rpc::rpc_helper::OrderTag; use garage_table::*; use garage_util::data::*; diff --git a/src/api/s3/put.rs b/src/api/s3/put.rs index 8902b14c..6dd68360 100644 --- a/src/api/s3/put.rs +++ b/src/api/s3/put.rs @@ -16,7 +16,7 @@ use opentelemetry::{ Context, }; -use garage_rpc::netapp::bytes_buf::BytesBuf; +use garage_net::bytes_buf::BytesBuf; use garage_table::*; use garage_util::async_hash::*; use garage_util::data::*; |