fix merge conflicts

Signed-off-by: Alex Chi <chi@neon.tech>
2026-01-15 01:12:56 +00:00 · 2023-06-27 10:25:06 -04:00
parent 21d30fc43f
commit ce1e57faea
1 changed files with 1 additions and 0 deletions
--- a/pageserver/src/tenant/timeline.rs
+++ b/pageserver/src/tenant/timeline.rs
@@ -4032,6 +4032,7 @@ impl Timeline {
                LayerResidenceEventReason::LayerCreate,
            );
            updates.insert_historic(x.layer_desc().clone());
+            mapping.insert(x);
        }

        // Now that we have reshuffled the data to set of new delta layers, we can