mirror of
https://github.com/jmcorgan/fips.git
synced 2026-10-05 19:18:25 +00:00
Conflicts resolved: - testing/chaos/sim/netem.py: master re-applies veth netem through _apply_veth, on the restarted node and on each surviving neighbour's end of a recreated pair. _apply_veth now installs state.tc_args(), so both ends of a flapped Ethernet link stay at 100% loss across a node restart. On maint only the restarted end was held. - testing/chaos/sim/runner.py: kept master's version. Master already waits for three agreeing tree reads before the final snapshot, which spans the restored nodes' control-socket start-up, so maint's separate control-socket wait is not added and the final snapshot keeps a single wait. - testing/ci-local.sh: run_chaos keeps master's per-run results directory and adds maint's load-window begin mark after it.