Merge branch 'master' into support_ssd_volume

2021-02-09 11:37:07 -08:00
parent 15da5834e1 a6e8d606b4
commit 821c46edf1
212 changed files with 5765 additions and 2102 deletions
--- a/weed/server/filer_server_handlers_write.go
+++ b/weed/server/filer_server_handlers_write.go
@@ -96,7 +96,7 @@ func (fs *FilerServer) DeleteHandler(w http.ResponseWriter, r *http.Request) {
 		glog.V(1).Infoln("deleting", objectPath, ":", err.Error())
 		httpStatus := http.StatusInternalServerError
 		if err == filer_pb.ErrNotFound {
-			httpStatus = http.StatusNotFound
+			httpStatus = http.StatusNoContent
 		}
 		writeJsonError(w, r, httpStatus, err)
 		return