chore: resolve rebase conflicts

Author: echobt

crates/distributed-storage/src/local.rs

@@ -1579,4 +1579,4 @@ mod tests {
             .expect("list_range failed");
         assert!(result.is_empty());
     }
-}
+}

crates/distributed-storage/src/replication.rs

@@ -592,4 +592,4 @@ mod tests {
         manager.cleanup_completed(50);
         assert_eq!(manager.tracked_count(), 0);
     }
-}
+}

crates/rpc-server/src/handlers.rs

@@ -1190,4 +1190,4 @@ mod tests {
         assert!(response.0.success);
         assert_eq!(response.0.data, Some(true));
     }
-}
+}

crates/rpc-server/src/health.rs

@@ -377,4 +377,4 @@ mod tests {
         let response = health.get_health();
         assert_eq!(response.status, HealthStatus::Degraded);
     }
-}
+}