summary refs log tree commit diff
diff options
context:
space:
mode:
authorPjotr Prins2026-01-05 11:11:28 +0100
committerPjotr Prins2026-01-05 11:12:11 +0100
commit6b71706c930b9a7f9dc503e633ec333ca800807c (patch)
tree6d6373c6ed583cd82fa138e9c2f1f6a79eda2d22
parentbd4167bee2888a0b25c471ca589d4490d4a4feae (diff)
downloadgn-gemtext-main.tar.gz
conflict main
-rw-r--r--topics/octopus/lizardfs/lizard-maintenance.gmi2
1 files changed, 2 insertions, 0 deletions
diff --git a/topics/octopus/lizardfs/lizard-maintenance.gmi b/topics/octopus/lizardfs/lizard-maintenance.gmi
index ef04b69..a34ef3e 100644
--- a/topics/octopus/lizardfs/lizard-maintenance.gmi
+++ b/topics/octopus/lizardfs/lizard-maintenance.gmi
@@ -73,6 +73,7 @@ Chunks deletion state:
         2ssd    7984    -       -       -       -       -       -       -       -       -       -
 ```
 
+<<<<<<< HEAD
 This table essentially says that slow and fast are replicating data (if they are in column 0 it is OK!). This looks good for fast:
 
 ```
@@ -81,6 +82,7 @@ Chunks replication state:
         slow    -       137461  448977  -       -       -       -       -       -       -       -
         fast    6133152 -       5       -       -       -       -       -       -       -       -
 ```
+This table essentially says that slow and fast are replicating data (if they are in column 0 it is OK!).
 
 To query how the individual disks are filling up and if there are any errors: