Small bug fixes #120

Merged
lx merged 2 commits from cleanups into main 2021-10-11 12:35:02 +00:00
2 changed files with 7 additions and 2 deletions

View file

@ -1,6 +1,6 @@
use std::sync::Arc; use std::sync::Arc;
use hyper::{Body, Request, Response}; use hyper::{Body, Request, Response, StatusCode};
use garage_util::data::*; use garage_util::data::*;
use garage_util::time::*; use garage_util::time::*;
@ -68,6 +68,7 @@ pub async fn handle_delete(
Ok(Response::builder() Ok(Response::builder()
.header("x-amz-version-id", hex::encode(delete_marker_version)) .header("x-amz-version-id", hex::encode(delete_marker_version))
.status(StatusCode::NO_CONTENT)
.body(Body::from(vec![])) .body(Body::from(vec![]))
.unwrap()) .unwrap())
} }

View file

@ -423,7 +423,11 @@ impl AdminRpcHandler {
writeln!( writeln!(
&mut ret, &mut ret,
"\nGarage version: {}", "\nGarage version: {}",
git_version::git_version!() git_version::git_version!(
prefix = "git:",
cargo_prefix = "cargo:",
fallback = "unknown"
)
) )
.unwrap(); .unwrap();