From bc6281a5b529b3c0be156fd85ee41302e5080c20 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 18 May 2022 22:33:27 +0200
Subject: [PATCH] k2v client from main garage repo

---
 Cargo.lock   | 2 +-
 Cargo.toml   | 2 +-
 src/bayou.rs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8f1fa0f..5c6e76b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -505,7 +505,7 @@ dependencies = [
 [[package]]
 name = "k2v-client"
 version = "0.1.0"
-source = "git+https://git.deuxfleurs.fr/trinity-1686a/garage.git?branch=k2v-client#eca192af4301045a7c7f65c22cb7818e1bb634b4"
+source = "git+https://git.deuxfleurs.fr/Deuxfleurs/garage.git#64c193e3dbb536d5d3c2881bc9aebbb3e4e6272e"
 dependencies = [
  "base64",
  "http",
diff --git a/Cargo.toml b/Cargo.toml
index e17b5d7..8f45020 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,4 +23,4 @@ sodiumoxide = "0.2"
 tokio = "1.17.0"
 zstd = { version = "0.9", default-features = false }
 
-k2v-client = { git = "https://git.deuxfleurs.fr/trinity-1686a/garage.git", branch = "k2v-client" }
+k2v-client = { git = "https://git.deuxfleurs.fr/Deuxfleurs/garage.git" }
diff --git a/src/bayou.rs b/src/bayou.rs
index ca5158e..b784ced 100644
--- a/src/bayou.rs
+++ b/src/bayou.rs
@@ -152,7 +152,7 @@ impl<S: BayouState> Bayou<S> {
                 },
                 single_item: false,
                 conflicts_only: false,
-                include_tombstones: false,
+                tombstones: false,
             }])
             .await?
             .into_iter()