From 5ea24254a91c3794ceb69e68c940b13f5447f40c Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 13 Feb 2024 12:55:41 +0100
Subject: [import-netapp] import Netapp code into Garage codebase

---
 src/api/Cargo.toml | 1 +
 src/api/s3/copy.rs | 2 +-
 src/api/s3/put.rs  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/api')

diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml
index ee811134..bc6b6aa7 100644
--- a/src/api/Cargo.toml
+++ b/src/api/Cargo.toml
@@ -17,6 +17,7 @@ path = "lib.rs"
 garage_model.workspace = true
 garage_table.workspace = true
 garage_block.workspace = true
+garage_net.workspace = true
 garage_util.workspace = true
 garage_rpc.workspace = true
 
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 5ac5fb6b..fdfa567d 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::*;
-- 
cgit v1.2.3