mirror of
https://github.com/XRPLF/rippled.git
synced 2026-08-21 14:20:56 +00:00
99ae7cfb5f
Four files conflicted. xrpl.proto and TraceContextPropagator.h: phase-9's note is a semantic superset of phase-8's and already carries no plan-folder pointer, so phase-9's text is kept and nothing phase-8 said is lost. node-health.json: the only change phase-8 makes to this file is renaming a row that phase-9 had already deleted, so phase-9's file stands. Panel count holds at 59 and both Validated Ledger Seq panels survive. TESTING.md: resolved per hunk rather than by side. Phase-9's replacement of the drifted span table and its new Grafana Cloud section are kept, and phase-8's de-numbered "Test 3: Log-Trace Correlation" heading is taken -- keeping phase-9 wholesale would have reinstated the phase number that phase-8 removed.