From f6060b92aa2e8c26d3d1fddb5bb9823db05d4524 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 11 Oct 2021 14:24:49 +0200 Subject: [PATCH 1/2] Fix HTTP return code for DeleteObject (fix #98) --- src/api/s3_delete.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api/s3_delete.rs b/src/api/s3_delete.rs index a391a33e..efe325ae 100644 --- a/src/api/s3_delete.rs +++ b/src/api/s3_delete.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use hyper::{Body, Request, Response}; +use hyper::{Body, Request, Response, StatusCode}; use garage_util::data::*; use garage_util::time::*; @@ -68,6 +68,7 @@ pub async fn handle_delete( Ok(Response::builder() .header("x-amz-version-id", hex::encode(delete_marker_version)) + .status(StatusCode::NO_CONTENT) .body(Body::from(vec![])) .unwrap()) } -- 2.43.4 From 1acf7e4c66aab0a0b5bcce8eb2965b35d587dd2a Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 11 Oct 2021 14:26:54 +0200 Subject: [PATCH 2/2] Fix git_version!() when not in git repo (fix #100) --- src/garage/admin_rpc.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/garage/admin_rpc.rs b/src/garage/admin_rpc.rs index b1538a30..19cba3b6 100644 --- a/src/garage/admin_rpc.rs +++ b/src/garage/admin_rpc.rs @@ -423,7 +423,11 @@ impl AdminRpcHandler { writeln!( &mut ret, "\nGarage version: {}", - git_version::git_version!() + git_version::git_version!( + prefix = "git:", + cargo_prefix = "cargo:", + fallback = "unknown" + ) ) .unwrap(); -- 2.43.4