Skip to content

Commit 880eeb2

Browse files
committed
Merge origin/develop into feat/rfc9991-forensic-reporting
Conflicts in reports/opendmarc-reports.in and .8.in: develop's trusteddomainproject#437/trusteddomainproject#438 are squash-merged copies of commits this branch already had (from before its DMARCbis work started) under different, non-PR-suffixed hashes -- same author, same message, same content, just two different paths to develop's tip vs. this branch's history. This branch's side of every conflicting hunk is a strict superset (log_skip()'s syslog integration, the "rate limit" loud_skip() reason, and the rua=/ruf= external- destination verification block, none of which exist yet on develop) of develop's side, so resolved by taking this branch's version throughout. Verified on quark: perl -c on the generated opendmarc-reports script is clean, and the full live test suite (11/11) still passes post-merge.
2 parents dd95bce + 3968b72 commit 880eeb2

0 file changed

File tree

    0 commit comments

    Comments
     (0)