mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 10:59:59 +00:00
No conflicts. Two files were touched by both sides and both kept each side: the Makefile, where upstream retires the mcp-audit target and this branch pins the throwaway cluster's vpn axis, and requirement 035, where the role table keeps the single svc-net-wireguard row. Incoming carries the fixes for two applications this branch's last run failed on -- penpot probing its frontend without curl, and mobilizon's postgres 18 migrations -- plus dependency bumps and a lint repair. Gates on the merged tree: unit 6202, lint 523, integration 330, ansible-lint clean.