mirror of
https://github.com/jmcorgan/fips.git
synced 2026-10-05 19:18:25 +00:00
Conflicts resolved: - CHANGELOG.md: kept every [Unreleased] entry from master and added the twelve new maint entries under matching headings (Deprecated/Windows ahead of Removed; Fixed/OpenWrt, Fixed/Sessions and rekey, Fixed/Windows; a new Security/Sessions and rekey). maint's Fixed/Links and transports block is dropped: its two entries are already on master under Data plane and transports, in master's wording. - .github/workflows/ci.yml: both sides kept. The Linux unit-test job runs the flaky-test report right after nextest and then the privileged interface-binding step; the macOS job creates its address-less interface and then clears the cached nextest report; the Windows job takes maint's report cleanup. - testing/ci-local.sh: both the medium-change and mdns suites are listed, defined, dispatched and run. Adapted beyond the conflicts: the rekey resend test helper in src/proto/fmp/tests/core.rs no longer sets is_healthy, which master removed from the establish snapshot.