mirror of
https://github.com/XRPLF/rippled.git
synced 2026-09-26 23:19:07 +00:00
de895c6d1e
Two conflicts, both additive on each side. TelemetryConfig.cpp: include blocks only. This branch added FileUtilities.h for the certificate readability checks; upstream added <limits> and <optional> for the bounds parser. Both kept. The TelemetryConfig test: this branch's mutual-TLS cases and upstream's batch-bounds cases were added at the same positions, so the file is rebuilt from both stages and carries all 32 tests. Two shared cases were each edited by one side only, so the edited side wins in each: upstream asserts the batch defaults in parse_empty_section, and this branch's parse_full_section writes a real certificate file, which is now required since the parser opens it.