mirror of
https://github.com/XRPLF/rippled.git
synced 2026-09-27 07:26:51 +00:00
Two conflicts, both additive. TelemetryConfig.cpp: this branch added requireHttpsEndpoint next to requireReadableFile; upstream added readConsensusTraceStrategy at the same spot. Both kept. 05-configuration-reference.md: this branch added the two client-certificate rows while upstream corrected the consensus strategy value from attribute to random. Both kept. Also drops the stale "not yet implemented" row for consensus_trace_strategy, which the merged table now contradicts twice over: the option is parsed, and its value is no longer spelled attribute.