Merge main into merge/upstream-v0.16.24
The schema, which both sides changed, merged as JSON with no conflicts. The personal-data catalog (#83) gains upstream's new x:DnsServerPowerDns: nothing personal but its API key, like the other DNS providers.
This commit is contained in:
@@ -47532,7 +47532,9 @@ impl Default for WebHook {
|
||||
level: TracingLevel::Info,
|
||||
lossy: false,
|
||||
events: Default::default(),
|
||||
events_policy: EventPolicy::Exclude,
|
||||
// inbuxa: personal-data catalog, D7: a new webhook sends nothing
|
||||
// until its events are chosen
|
||||
events_policy: EventPolicy::Include,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user